diff --git a/IlluminatedCloud/Salesforce_Indicators__dev/OfflineSymbolTable.zip b/IlluminatedCloud/Salesforce_Indicators__dev/OfflineSymbolTable.zip
new file mode 100644
index 0000000..ca3c7ab
Binary files /dev/null and b/IlluminatedCloud/Salesforce_Indicators__dev/OfflineSymbolTable.zip differ
diff --git a/force-app/main/default/classes/ObjectFieldSelectorController.cls b/force-app/main/default/classes/ObjectFieldSelectorController.cls
new file mode 100644
index 0000000..8c32eb4
--- /dev/null
+++ b/force-app/main/default/classes/ObjectFieldSelectorController.cls
@@ -0,0 +1,116 @@
+public with sharing class ObjectFieldSelectorController {
+
+    public static final String STANDARD = 'standard';
+    public static final String SPECIFIC = 'specific';
+    public static final String CUSTOM = 'custom';
+    public static final String BOTH = 'both';
+    public static final String ANCILLARY = 'ancillary';
+    public static final String ALL = 'all';
+
+    @AuraEnabled
+    public static GetObjectsResult getObjects(String selectionType, List<String> availableObjects) {
+        if (String.isBlank(selectionType))
+            selectionType = BOTH;
+        selectionType = selectionType.toLowerCase();
+        GetObjectsResult result = new GetObjectsResult();
+        result.objects = new List<ObjectResult>();
+        List<Schema.DescribeSObjectResult> describeResults = new List<Schema.DescribeSObjectResult>();
+        if (selectionType == ALL) {
+            Map<String, Schema.SObjectType> objMap = Schema.getGlobalDescribe();
+            for (Schema.SObjectType objType : objMap.values()) {
+                describeResults.add(objType.getDescribe());
+            }
+        } else if (selectionType == SPECIFIC) {
+            describeResults = Schema.describeSObjects(availableObjects);
+        } else {
+            List<String> objectNames = new List<String>();
+            List<EntityDefinition> entityDefs = new List<EntityDefinition>();
+            if (selectionType == STANDARD || selectionType == BOTH) {
+                entityDefs.addAll([SELECT KeyPrefix, QualifiedApiName, DeveloperName FROM EntityDefinition WHERE (NOT QualifiedApiName LIKE '%__c') AND (NOT QualifiedApiName LIKE '%Feed') AND (NOT QualifiedApiName LIKE '%Tag') AND (NOT QualifiedApiName LIKE '%Share') AND (NOT QualifiedApiName LIKE '%ChangeEvent') AND (NOT QualifiedApiName LIKE '%History')]);
+            }
+            if (selectionType == CUSTOM || selectionType == BOTH) {
+                entityDefs.addAll([SELECT QualifiedApiName FROM EntityDefinition WHERE QualifiedApiName LIKE '%__c']);
+            }
+            if (selectionType == ANCILLARY) {
+                entityDefs.addAll([SELECT QualifiedApiName, DeveloperName FROM EntityDefinition WHERE QualifiedApiName LIKE '%Feed' OR QualifiedApiName LIKE '%Tag' OR QualifiedApiName LIKE '%Share' OR QualifiedApiName LIKE '%ChangeEvent' OR QualifiedApiName LIKE '%History']);
+            }
+            for (EntityDefinition def : entityDefs) {
+                // The standard list of EntityDefinitions may still return some odd types like metadata, so we filter out any object with double underscores
+                if (selectionType != STANDARD || !def.QualifiedApiName.contains('__')) {
+                    objectNames.add(def.QualifiedApiName);
+                }
+            }
+            describeResults = Schema.describeSObjects(objectNames);
+        }
+        for (Schema.DescribeSObjectResult res : describeResults) {
+            result.objects.add(new ObjectResult(res.getLabel(), res.getName()));
+        }
+        return result;
+    }
+
+    @AuraEnabled(cacheable=true)
+    public static GetObjectFieldsResult getObjectFields(String objectName) {
+        GetObjectFieldsResult result = new GetObjectFieldsResult();
+        result.fields = new List<FieldResult>();
+        try {
+            Map<String, Schema.SObjectField> tokenMap = ((SObject)Type.forName('Schema', objectName).newInstance()).getSObjectType().getDescribe().fields.getMap();
+            for (Schema.SObjectField objField : tokenMap.values()) {
+                FieldResult newField = new FieldResult(objField.getDescribe());
+                System.debug(newField);
+                result.fields.add(newField);
+            }        
+        } catch (Exception e) {
+            result.errorMessage = e.getMessage();
+            return result;
+        }
+        System.debug('about to return result, with '+ result.fields.size() +' fields');
+        return result;
+    }
+
+    public class GetObjectsResult {
+        @AuraEnabled public List<ObjectResult> objects;
+    }
+
+    public class ObjectResult {
+        @AuraEnabled public String label;
+        @AuraEnabled public String value;
+
+        public ObjectResult(String label, String value) {
+            this.label = label;
+            this.value = value;
+        }        
+    }
+
+    public class GetObjectFieldsResult {
+        @AuraEnabled public String errorMessage;
+        @AuraEnabled public List<FieldResult> fields;
+    }
+
+    public class FieldResult {
+        @AuraEnabled public String apiName;
+        @AuraEnabled public String label;
+        @AuraEnabled public String dataType;
+        @AuraEnabled public boolean nameField;
+        @AuraEnabled public List<ReferenceToInfo> referenceToInfos;
+
+        public FieldResult(Schema.DescribeFieldResult fieldResult) {
+            this.apiName = fieldResult.getName();
+            this.label = fieldResult.getLabel();
+            this.dataType = fieldResult.getType().name();
+            this.nameField = fieldResult.isNameField();
+            List<ReferenceToInfo> refToInfos = new List<ReferenceToInfo>();
+            for (Schema.sObjectType objType : fieldResult.getReferenceTo()) {
+                refToInfos.add(new ReferenceToInfo(objType.getDescribe().getName()));
+            }
+            this.referenceToInfos = refToInfos;
+        }
+    }
+
+    public class ReferenceToInfo {
+        @AuraEnabled public String apiName;
+
+        public ReferenceToInfo(String apiName) {
+            this.apiName = apiName;
+        }
+    }
+}
diff --git a/force-app/main/default/classes/ObjectFieldSelectorController.cls-meta.xml b/force-app/main/default/classes/ObjectFieldSelectorController.cls-meta.xml
new file mode 100644
index 0000000..40d6793
--- /dev/null
+++ b/force-app/main/default/classes/ObjectFieldSelectorController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/ObjectFieldSelectorControllerTest.cls b/force-app/main/default/classes/ObjectFieldSelectorControllerTest.cls
new file mode 100644
index 0000000..8c0cb53
--- /dev/null
+++ b/force-app/main/default/classes/ObjectFieldSelectorControllerTest.cls
@@ -0,0 +1,18 @@
+@isTest
+public class ObjectFieldSelectorControllerTest {
+
+    @isTest
+    public static void testOFSController() {
+        ObjectFieldSelectorController.GetObjectsResult result1 = ObjectFieldSelectorController.getObjects('all', new List<String>());
+        ObjectFieldSelectorController.GetObjectsResult result2 = ObjectFieldSelectorController.getObjects('both', new List<String>());
+        ObjectFieldSelectorController.GetObjectsResult result3 = ObjectFieldSelectorController.getObjects('specific', new List<String>{'Account', 'Opportunity'});
+        System.assertEquals(result3.objects.size(), 2);
+        System.assert(result3.objects.size() < result2.objects.size());
+        System.assert(result2.objects.size() < result1.objects.size());
+
+        ObjectFieldSelectorController.GetObjectFieldsResult result4 = ObjectFieldSelectorController.getObjectFields('Account');
+        ObjectFieldSelectorController.GetObjectFieldsResult result5 = ObjectFieldSelectorController.getObjectFields('NotARealObject');
+        System.assert(String.isBlank(result4.errorMessage));
+        System.assert(!String.isBlank(result5.errorMessage));
+    }
+}
diff --git a/force-app/main/default/classes/ObjectFieldSelectorControllerTest.cls-meta.xml b/force-app/main/default/classes/ObjectFieldSelectorControllerTest.cls-meta.xml
new file mode 100644
index 0000000..40d6793
--- /dev/null
+++ b/force-app/main/default/classes/ObjectFieldSelectorControllerTest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/SldsIconController.cls b/force-app/main/default/classes/SldsIconController.cls
new file mode 100644
index 0000000..a724921
--- /dev/null
+++ b/force-app/main/default/classes/SldsIconController.cls
@@ -0,0 +1,56 @@
+public with sharing class SldsIconController {
+
+    static final String COMMA = ',';
+    static final String NEWLINE = '\r\n';
+    static final String SPACE = ' ';
+    
+    public class Option {
+        @AuraEnabled
+        public String label {get; set;}
+        @AuraEnabled
+        public String value {get; set;}
+        @AuraEnabled
+        public String icon {get; set;}
+    }
+
+    @AuraEnabled (cacheable=true)
+    public static List<Option> getIconOptions() {
+    
+        List<Option> options = new List<Option>();
+
+        Option emptyOption = new Option();
+        emptyOption.label = '--None--';
+        emptyOption.value = null;
+
+        options.add(emptyOption);
+
+        try {
+            StaticResource sr = [
+                SELECT Body
+                FROM StaticResource 
+                WHERE Name = 'SldsIcons'
+                AND NamespacePrefix = ''
+            ];
+
+            String content = sr.Body.toString();
+
+            List<String> rows = content.split(NEWLINE);
+            for( Integer i = 1; i < rows.size(); i++ ){
+                Option option = new Option();
+                List<String> columns = rows[i].split(COMMA);
+                option.label = columns[0].trim();
+                option.value = columns[0].trim();
+                option.icon = columns[0].trim();
+                columns.remove(0);
+
+                options.add(option);
+            }
+        } catch (Exception e) {
+            AuraHandledException ahe = new AuraHandledException(e.getMessage());
+            ahe.setMessage('Aura Handled Exception thrown.');
+            throw ahe;
+        }
+
+        return options;
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/SldsIconController.cls-meta.xml b/force-app/main/default/classes/SldsIconController.cls-meta.xml
new file mode 100644
index 0000000..7d5f9e8
--- /dev/null
+++ b/force-app/main/default/classes/SldsIconController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/SldsIconControllerTests.cls b/force-app/main/default/classes/SldsIconControllerTests.cls
new file mode 100644
index 0000000..9db825b
--- /dev/null
+++ b/force-app/main/default/classes/SldsIconControllerTests.cls
@@ -0,0 +1,26 @@
+@isTest
+private class SldsIconControllerTests {
+    
+    @isTest
+    static void gracefullyHandleMissingStaticResource(){
+        try{
+            SldsIconController.getIconOptions();
+        } catch (Exception e){
+            String errorMsg = e.getMessage();
+            Assert.areEqual('Aura Handled Exception thrown.', errorMsg);
+        }
+    }
+
+    @isTest
+    static void successfullyRetrieveAndProcessStaticResource(){
+ 
+        List<SldsIconController.Option> results = SldsIconController.getIconOptions();
+
+        Assert.areEqual('--None--', results[0].label);
+        Assert.isNull(results[0].value);
+        Assert.isNull(results[0].icon);
+ 
+    }
+
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/SldsIconControllerTests.cls-meta.xml b/force-app/main/default/classes/SldsIconControllerTests.cls-meta.xml
new file mode 100644
index 0000000..7d5f9e8
--- /dev/null
+++ b/force-app/main/default/classes/SldsIconControllerTests.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_combobox/fsc_combobox.css b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.css
new file mode 100644
index 0000000..70ed2a5
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.css
@@ -0,0 +1,3 @@
+.disabledCursor, .disabledCursor ~ .slds-button {
+    cursor: not-allowed;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_combobox/fsc_combobox.html b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.html
new file mode 100644
index 0000000..993edcd
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.html
@@ -0,0 +1,182 @@
+<template>
+    <div style={publicStyle} class={publicClass}>
+        <div class="slds-form-element">
+            <div class="slds-form-element__control">
+                <template if:true={showSelectedValue}>
+                    <label>
+                        <template if:true={showLabel}>
+                            <p class="slds-form-element__label">
+                                <abbr class="slds-required" title="required" if:true={required}>*</abbr>
+                                {computedLabel}
+                                <template if:true={fieldLevelHelp}>
+                                    <lightning-helptext content={fieldLevelHelp}></lightning-helptext>
+                                </template>
+                            </p>
+                        </template>
+                        <div class={computedComboboxContainerClass} onkeydown={handleSearchKeydown}>
+                            <div class="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click">
+                                <div class={computedSelectedValueClass} role="none">
+                                    <span class="slds-icon_container slds-combobox__input-entity-icon">
+                                        <lightning-icon icon-name={selectedOption.icon} size="x-small"></lightning-icon>
+                                    </span>
+                                    <button type="button" class={computedFauxInputClass} aria-expanded="false"
+                                        aria-haspopup="listbox" onclick={handleSelectedValueClick}>
+                                        <span class="slds-truncate">{selectedOption.label}</span>
+                                    </button>
+                                    <template if:true={isBaseVariant}>
+                                        <span
+                                            class="slds-icon_container slds-icon-utility-down slds-input__icon slds-input__icon_right">
+                                            <lightning-icon icon-name="utility:down" size="x-small"></lightning-icon>
+                                        </span>
+                                    </template>
+                                    <template if:false={isBaseVariant}>
+                                        <button
+                                            class="slds-button slds-button_icon slds-input__icon slds-input__icon_right"
+                                            title="Clear the text input" onclick={handleClearClick}>
+                                            <lightning-icon icon-name="utility:close" size="x-small"
+                                                class="slds-button__icon">
+                                            </lightning-icon>
+                                        </button>
+                                    </template>
+                                </div>
+                            </div>
+                        </div>
+                    </label>
+
+                </template>
+                <template if:false={showSelectedValue}>
+                    <div class={computedComboboxContainerClass}>
+                        <div class={computedComboboxClass} aria-expanded="true" aria-haspopup="listbox" role="combobox">
+                            <div class="slds-combobox__form-element slds-input-has-icon slds-input-has-icon_right"
+                                role="none">
+                                <div class={computedFormElementClass}>
+                                    <label>
+                                        <template if:true={label}>
+                                            <p class="slds-form-element__label">
+                                                <abbr class="slds-required" title="required" if:true={required}>*</abbr>
+                                                {computedLabel}
+                                                <template if:true={fieldLevelHelp}>
+                                                    <lightning-helptext content={fieldLevelHelp}
+                                                        class="slds-m-left_xx-small"></lightning-helptext>
+                                                </template>
+                                            </p>
+                                        </template>
+                                        <div class="slds-combobox__form-element slds-input-has-icon slds-input-has-icon_group-right"
+                                            role="none">
+                                            <div class="slds-input__icon-group slds-input__icon-group_right">
+                                                <template if:true={isLoading}>
+                                                    <div role="status"
+                                                        class="slds-spinner slds-spinner_brand slds-spinner_x-small slds-input__spinner">
+                                                        <span class="slds-assistive-text">Loading</span>
+                                                        <div class="slds-spinner__dot-a"></div>
+                                                        <div class="slds-spinner__dot-b"></div>
+                                                    </div>
+                                                </template>
+                                                <template if:true={rightIcon}>
+                                                    <lightning-icon icon-name={rightIcon} size="xx-small"
+                                                        class="slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default slds-text-link_reset"
+                                                        aria-hidden="true"></lightning-icon>
+                                                </template>
+                                            </div>
+                                            <input type="text" placeholder={placeholder} onclick={handleSearchClick}
+                                                onfocus={handleSearchFocus} onblur={handleSearchBlur}
+                                                oninput={handleSearchChange} onkeydown={handleSearchKeydown}
+                                                disabled={isInputDisabled} class="slds-input" required />
+                                        </div>
+                                        <div class="slds-form-element__help">{errorMessage}</div>
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="slds-dropdown slds-dropdown_length-10 slds-dropdown_fluid" role="listbox"
+                                onscroll={handleListboxScroll}>
+                                <ul class="slds-listbox slds-listbox_vertical" role="presentation">
+                                    <template for:each={options} for:item="option">
+                                        <template if:false={option.hidden}>
+                                            <li role="presentation" class="slds-listbox__item" key={option.value}
+                                                title={option.label} data-index={option.index}
+                                                onmousedown={handleOptionSelect} onmouseenter={handleOptionMouseenter}
+                                                onmouseleave={handleOptionMouseleave}>
+                                                <template if:false={option.isGrouping}>
+                                                    <div class={option.comboboxClass} data-has-focus={option.hasFocus}
+                                                        role="option">
+                                                        <span class="slds-media__figure slds-listbox__option-icon">
+                                                            <template if:true={option.icon}>
+                                                                <lightning-icon icon-name={option.icon} size={iconSize}>
+                                                                </lightning-icon>
+                                                            </template>
+                                                        </span>
+
+                                                        <span class="slds-media__body">
+                                                            <span
+                                                                class="slds-listbox__option-text slds-listbox__option-text_entity">{option.label}</span>
+                                                            <span
+                                                                class="slds-listbox__option-meta slds-listbox__option-meta_entity">
+                                                                {option.sublabel}</span>
+                                                        </span>
+                                                        <lightning-icon icon-name={option.rightIcon} size="x-small">
+                                                        </lightning-icon>
+                                                    </div>
+                                                </template>
+                                                <template if:true={option.isGrouping}>
+                                                    <div class="slds-media slds-media_center slds-listbox__option slds-listbox__option_has-meta slds-listbox__option_plain"
+                                                        role="presentation">
+                                                        <h3 class={groupingTextClass} role="presentation">
+                                                            {option.label}</h3>
+                                                    </div>
+                                                </template>
+                                            </li>
+                                        </template>
+                                    </template>
+                                    <template if:true={noMatchFound}>
+                                        <li role="presentation" class="slds-listbox__item">
+                                            <span
+                                                class="slds-media slds-listbox__option slds-listbox__option_entity slds-listbox__option_has-meta slds-has-focus"
+                                                role="option">
+                                                <span class="slds-media__body">
+                                                    <span class="slds-truncate">
+                                                        {noMatchString}
+                                                    </span>
+                                                </span>
+                                            </span>
+                                        </li>
+                                    </template>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                    <template if:true={showPills}>
+                        <div class={computedListboxSelectionGroupClass}>
+                            <ul class="slds-listbox slds-listbox_horizontal" role="listbox">
+                                <template for:each={selectedOptions} for:item="selectedValue" for:index="index">
+                                    <li class="slds-listbox-item slds-p-around_xxx-small" key={selectedValue.value}>
+                                        <lightning-pill label={selectedValue.label} data-index={index}
+                                            onremove={handleOptionUnselect} title={selectedValue.value}
+                                            name={selectedValue.value}>
+                                            <template if:true={selectedValue.icon}>
+                                                <lightning-icon icon-name={selectedValue.icon} size={iconSize}>
+                                                </lightning-icon>
+                                            </template>
+                                        </lightning-pill>
+                                    </li>
+                                </template>
+                                <template if:true={pillsNotFittingCount}>
+                                    <template if:true={pillContainerIsExpanded}>
+                                        <button class="slds-button"
+                                            onclick={handleCollapsePillContainer}>Collapse</button>
+                                    </template>
+                                    <template if:false={pillContainerIsExpanded}>
+                                        <span class="slds-listbox-toggle">
+                                            <button class="slds-button"
+                                                onclick={handleExpandPillContainer}>+{pillsNotFittingCount}
+                                                more</button>
+                                        </span>
+                                    </template>
+                                </template>
+                            </ul>
+                        </div>
+                    </template>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_combobox/fsc_combobox.js b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.js
new file mode 100644
index 0000000..29c229e
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.js
@@ -0,0 +1,620 @@
+// Style from: https://www.lightningdesignsystem.com/components/combobox
+import { LightningElement, api, track } from 'lwc';
+import { KEYS, setValuesFromMultipleInput, setValuesFromSingularInput, includesIgnoreCase, CLEAR_REQUEST_EVENT_NAME } from 'c/fsc_comboboxUtils';
+
+const VARIANTS = {
+    BASE: 'base',
+    STANDARD: 'standard',
+    LABEL_HIDDEN: 'label-hidden'
+}
+
+const LOAD_COUNT = 50;
+
+export default class OptionSelector extends LightningElement {
+    /* PUBLIC PROPERTIES */
+    @api publicStyle;
+    @api publicClass;
+    @api label;
+    @api name;
+    @api customSearchHandler;   // Custom function to be executed by handleSearchChange, passed in from a parent component.
+    @api messageWhenValueMissing = 'Please select at least one option.';
+    @api iconSize = 'x-small';
+    @api placeholder = 'Select an option';
+    @api noMatchString = 'No matches found';
+    @api valueDelimiter = ',';
+    @api rightIcon = 'utility:down';    // Icon to be displayed on the right side of the search input
+    @api groupingTextClass = 'slds-listbox__option-header';
+    @api fieldLevelHelp;
+    @api errorMessage;
+    @api variant;
+    @api required = false;
+    @api disabled = false;
+    @api isLoading = false;
+    @api allowMultiselect = false;
+    // @api variant = VARIANTS.STANDARD;   // RESERVED FOR FUTURE USE If set to 'base', when allowMultiselect is false, when the combobox has a value set it will appear like a base combobox rather than as an autocomplete 
+    @api hidePills = false; // If true, list of selected pills in multiselect mode will not be displayed (generally because a parent component wants to display them differently).
+    @api excludeSublabelInFilter = false;   // If true, the 'sublabel' text of an option is not included when determining if an option is a match for a given search text.
+    @api includeValueInFilter = false;  // If true, the 'value' text of an option is included when determining if an option is a match for a given search text.
+    @api filterActions = false; // If true, action items will be filtered along with selection items. By default, action items are always visible
+    @api showSelectedCount = false; // If true, when allowMultiselect is true, the component label will show the number of selected values in parentheses
+    @api notifyOnClear = false; // If true, clicking the clear button will not automatically clear the selection. Instead it will dispatch a notification event so that the parent component can implement any logic before clearing
+    @api includeFullDetails = false; // If true, include all of the details of all selectedOptions when dispatching changes, not just the values
+    @api hideSelectedValues = false;    // Reserved for future use
+
+    @api builderContext;
+
+    /* PRIVATE PROPERTIES */
+    @track _options = [];
+    @track _values = [];
+    @track _groupings = [];
+    @track onRender = {};   // Used to manage actions on render
+    @track onLoad = [];
+    pillsNotFittingCount = 0;
+    numOptionsDisplayed = LOAD_COUNT;
+    pillContainerIsExpanded = false;
+    pillsGoMultiLine = false;
+    pillTops = [];
+    debounceTimer;
+    showList;
+    _highlightedOptionIndex;
+
+    /* PUBLIC GETTERS & SETTERS */
+    @api
+    get debounceDelay() {
+        return this._debounceDelay;
+    }
+    set debounceDelay(delay) {
+        this._debounceDelay = parseInt(delay) || 0;
+    }
+    _debounceDelay = 0;
+
+    @api
+    get options() {
+        return this._options || [];
+    }
+    set options(options) {
+        let groupings = [];
+        if (Array.isArray(options)) {
+            this._options = options.map((option, index) => {
+                if (option.grouping && !groupings.includes(option.grouping)) {
+                    groupings.push(option.grouping);
+                }
+                return this.getComboboxOption(option, index);
+            });
+
+            if (groupings.length) {
+                let newIndex = 0;
+                let groupedOptions = [];
+                this._options.filter(option => !option.grouping).forEach(groupingOption => {
+                    groupingOption.index = newIndex;
+                    groupedOptions.push(groupingOption);
+                    newIndex++;
+                });
+
+                groupings.forEach(grouping => {
+                    groupedOptions.push({ label: grouping, isGrouping: true, index: newIndex });
+                    newIndex++;
+                    this._options.filter(option => option.grouping == grouping).forEach(groupingOption => {
+                        groupingOption.index = newIndex;
+                        groupedOptions.push(groupingOption);
+                        newIndex++;
+                    });
+                })
+                this._options = groupedOptions;
+            }
+            this.filterOptions();
+        } else {
+            this._options = [];
+        }
+    }
+
+    @api
+    get values() {
+        return this._values || [];
+    }
+    set values(values) {
+        this._values = setValuesFromMultipleInput(values);
+        // if (!values) {
+        //     this._values = [];
+        // } else {
+        //     this._values = Array.isArray(values) ? [...values] : [values];
+        // }
+    }
+
+    @api
+    get value() {
+        return this.values.join(this.valueDelimiter);
+    }
+    set value(value) {
+        this.values = setValuesFromSingularInput(value, this.valueDelimiter, this.allowMultiselect);
+        // if (!value) {
+        //     this.values = [];
+        // } else {
+        //     this.values = this.allowMultiselect ? value.split(this.valueDelimiter).map(val => val.trim()) : [value];
+        // }
+    }
+
+    @api
+    get groupings() {
+        return this._groupings || [];
+    }
+    set groupings(value) {
+        this._groupings = value.map(grouping => {
+            return {
+                value: grouping.value,
+                label: grouping.label
+            }
+        })
+        let groupedOptions = [];
+        value.forEach(grouping => {
+            let currentGroupingOptions = grouping.options.map(option => {
+                return {
+                    ...option,
+                    grouping: grouping.label
+                }
+            });
+            groupedOptions.push(...currentGroupingOptions);
+        });
+        this.options = groupedOptions;
+    }
+
+    @api
+    get selectedOptions() {
+        return this.options.filter(option => this.values.includes(option.value));
+        /* I think the above line of code does the same thing as the following paragraph?
+        let selectedOptions = [];
+        this.values.forEach(value => {
+            const option = this.options.find(option => option.value === value);
+            if (option) {
+                selectedOptions.push(option);
+            }
+        });
+        return selectedOptions;
+        */
+    }
+
+    get selectedOption() {
+        return this.selectedOptions.length ? this.selectedOptions[0] : null;
+    }
+
+    /* PUBLIC FUNCTIONS */
+    @api
+    reportValidity() {
+        if (!this.required || this.selectedOptions.length) {
+            this.setCustomValidity();
+        } else {
+            this.setCustomValidity(this.messageWhenValueMissing);
+        }
+        return !this.errorMessage;
+    }
+
+    @api
+    validate() {
+        if (this.reportValidity()) {
+            return { isValid: true };
+        } else {
+            return {
+                isValid: false,
+                errorMessage: this.errorMessage
+            }
+        }
+    }
+
+    @api
+    setCustomValidity(errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @api
+    focus() {
+        this.onRender.inputFocus = true;
+    }
+
+    /* LIFECYCLE HOOKS */
+    connectedCallback() {
+        window.addEventListener("resize", () => { this.resizePillContainer() });
+
+    }
+
+    renderedCallback() {
+        if (this.onRender.inputFocus) {
+            this.onRender.inputFocus = false;
+            this.inputElement?.focus();
+            // this.inputElement ? this.inputElement.focus() : this.template.querySelector('.slds-combobox__input').focus();
+        }
+        if (this.onRender.highlightOption) {
+            this.onRender.highlightOption = false;
+            const highlightedOption = this.template.querySelector('[data-has-focus="true"]');
+            this.scrollIntoViewIfNeeded(highlightedOption, this.listboxElement);
+        }
+
+        // Check to see if the arrangement of pills has changed since last render
+        let newPillTops = [...this.pillElements].map(pill => pill.offsetTop);
+        if (!(this.pillTops.length == newPillTops.length && this.pillTops.every((val, index) => val === newPillTops[index]))) {
+            this.pillTops = newPillTops;
+            this.resizePillContainer();
+        }
+    }
+
+    /* PRIVATE GETTERS AND SETTERS */
+    get highlightedOptionIndex() {
+        return this._highlightedOptionIndex;
+    }
+    set highlightedOptionIndex(value) {
+        this._highlightedOptionIndex = value;
+        this.options.forEach(option => option.hasFocus = option.index === this.highlightedOptionIndex); // Update the hasFocus property for all options
+    }
+
+    /* DOM ELEMENT GETTERS */
+    get inputElement() {
+        return this.template.querySelector('input');
+    }
+
+    get listboxElement() {
+        return this.template.querySelector('[role="listbox"]');
+    }
+
+    get pillElements() {
+        return this.template.querySelectorAll('lightning-pill');
+    }
+
+    /* COMPUTED LOGIC VALUES */
+    get displayedOptions() {
+        return this.options.slice(0, this.numOptionsDisplayed);
+    }
+
+    get isInputDisabled() {
+        // 5/6/2024: Removing isLoading as a disabling factor because it was interfering with the lookup component
+        return this.disabled;// || this.isLoading;
+    }
+
+    get noMatchFound() {
+        return this.options.every(option => option.hidden || option.isAction);
+    }
+
+    get showSelectedValue() {
+        return !this.allowMultiselect && this.selectedOption;
+    }
+
+    get showPills() {
+        return this.allowMultiselect && !this.hidePills && this.values.length;
+    }
+
+    get computedLabel() {
+        return this.label + ((this.allowMultiselect && this.showSelectedCount) ? ' (' + this.values.length + ')' : '');
+    }
+
+    get isBaseVariant() {
+        return this.variant === VARIANTS.BASE;
+    }
+
+    get showLabel() {
+        return this.label && this.variant !== VARIANTS.LABEL_HIDDEN;
+    }
+
+    /* COMPUTED CSS CLASS STRINGS */
+    get computedSelectedValueClass() {
+        return 'slds-combobox__form-element slds-input-has-icon' + (this.selectedOption?.icon ? ' slds-input-has-icon_left-right' : ' slds-input-has-icon_right');
+    }
+
+    get computedFormElementClass() {
+        return 'slds-form-element' + (this.errorMessage ? ' slds-has-error' : '');
+    }
+
+    get computedComboboxContainerClass() {
+        return 'slds-combobox_container' + ((this.value && !this.isBaseVariant) ? ' slds-has-selection' : '');
+    }
+
+    get computedComboboxClass() {
+        return 'slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click' + (this.showList ? ' slds-is-open' : '');
+    }
+
+    get computedListboxSelectionGroupClass() {
+        return 'slds-listbox_selection-group' + (this.pillContainerIsExpanded ? ' slds-is-expanded' : '');
+    }
+
+    get computedFauxInputClass() {
+        return 'slds-input_faux slds-combobox__input slds-combobox__input-value' + (this.disabled ? ' slds-theme_shade disabledCursor' : '');
+    }
+
+    /* ACTION FUNCTIONS */
+    openList() {
+        this.showList = true;
+        this.onRender.inputFocus = true;
+    }
+
+    closeList() {
+        this.showList = false;
+        this.highlightedOptionIndex = undefined;
+        this.numOptionsDisplayed = LOAD_COUNT;
+        if (this.listboxElement) {
+            this.listboxElement.scrollTop = 0;
+        }
+    }
+
+    resetSearch() {
+        this.inputElement.value = '';
+        this.filterOptions();
+    }
+
+    filterOptions() {
+        let searchText = (this.inputElement?.value || '').toLowerCase();
+        // console.log('in filterOptions', searchText);
+        let numDisplayedCount = 0;
+        for (let option of this.options) {
+            if (numDisplayedCount > this.numOptionsDisplayed) {
+                option.hidden = true;
+            } else if (searchText && option.isGrouping) {
+                option.hidden = true;
+            } else if (this.values.includes(option.value)) {
+                // If the option has already been selected, hide it from the list of available options
+                option.hidden = true;
+            }
+            else {
+                // If the option's label matches the search text, display it. Also optionally check the option's sublabel and value.
+                if (option.label.toLowerCase().includes(searchText)
+                    || (this.includeValueInFilter && option.value.toLowerCase().includes(searchText))
+                    || (!this.excludeSublabelInFilter && option.sublabel && option.sublabel.toLowerCase().includes(searchText))) {
+                    option.hidden = false;
+                    if (option.grouping) {
+                        this.options.find(grouping => grouping.isGrouping && grouping.label == option.grouping).hidden = false;
+                    }
+                } else {
+                    option.hidden = true;
+                }
+            }
+
+            if (!option.hidden) {
+                numDisplayedCount++;
+            }
+        }
+    }
+
+    selectOption(index) {
+        let selectedOption = this.options[index];
+        // console.log('selecting '+ JSON.stringify(selectedOption));
+        // console.log('value before adding: '+ this.value);
+        // console.log('values before adding: '+ JSON.stringify(this.values) +', length: '+ this.values.length);
+        if (!selectedOption || selectedOption.isGrouping) {
+            return;
+        }
+        if (selectedOption.isAction) {
+            this.dispatchEvent(new CustomEvent('customaction', { detail: selectedOption.value }));
+        } else {
+            this.values.push(selectedOption.value);
+            this.values = this.values;
+            // this.values = [...this.values, selectedOption.value];   // using spread instead of values.push to trigger the setter
+            this.resetSearch();
+            this.dispatchOptions();
+            this.onRender.inputFocus = true;
+        }
+    }
+
+    unselectOption(index) {
+        this.values = [...this.values.slice(0, index), ...this.values.slice(Number(index) + 1)];
+        this.dispatchOptions();
+    }
+
+    dispatchOptions() {
+        let detail = {
+            value: this.value,
+            values: this.values,
+            //selectedOptions: this.selectedOptions
+        }
+        if (this.includeFullDetails) {
+            detail.selectedOptions = this.selectedOptions;
+        }
+        this.dispatchEvent(new CustomEvent('change', { detail }));
+    }
+
+    highlightNextOption(startIndex) {
+        if (!startIndex || startIndex >= this.options.length) {
+            startIndex = 0;
+        }
+        if (this.options[startIndex].hidden || this.options[startIndex].isGrouping) {
+            this.highlightNextOption(Number(startIndex) + 1);
+        } else {
+            this.highlightOption(startIndex);
+        }
+    }
+
+    highlightPreviousOption(startIndex) {
+        if ((startIndex !== 0 && !startIndex) || startIndex < 0) {
+            startIndex = this.options.length - 1;
+        }
+        if (this.options[startIndex].hidden || this.options[startIndex].isGrouping) {
+            this.highlightPreviousOption(Number(startIndex) - 1);
+        } else {
+            this.highlightOption(startIndex);
+        }
+    }
+
+    @api
+    clearSelection() {
+        this.values = [];
+        this.dispatchOptions();
+        this.openList();
+    }
+
+    highlightOption(index) {
+        this.highlightedOptionIndex = index;
+        this.onRender.highlightOption = true;
+    }
+
+    resizePillContainer() {
+        let notFittingCount = 0;
+        this.pillElements.forEach((pill) => {
+            if (pill.offsetTop > this.pillElements[0].offsetTop + this.pillElements[0].getBoundingClientRect().height) {
+                notFittingCount += 1;
+            }
+        });
+        this.pillsNotFittingCount = notFittingCount;
+    }
+
+    /* EVENT HANDLERS */
+    handleSearchChange(event) {
+        let searchText = event.target.value;
+        this.openList();
+        this.debounce(
+            () => this.customSearchHandler ? this.customSearchHandler(searchText) : this.filterOptions(),
+            this.debounceDelay
+        );
+    }
+
+    handleSearchClick() {
+        this.handleSearchFocus();
+        this.openList();
+    }
+
+    handleSearchFocus() {
+        this.filterOptions();
+        this.errorMessage = '';
+    }
+
+    handleSearchBlur() {
+        if (this.inputElement.value && !this.showSelectedValue) {
+            let matchingValue = this.options.find(option => option.value?.toLowerCase() == this.inputElement.value?.toLowerCase());
+            // let matchingValue = this.options.find(option => {
+            //     console.log('searching option: '+ JSON.stringify(option) +', comparing it to '+ this.inputElement.value);
+            //     return option.value?.toLowerCase() == this.inputElement.value?.toLowerCase()
+            // });
+            if (matchingValue) {
+                this.selectOption(matchingValue.index);
+            }
+        }
+        this.closeList();
+        this.reportValidity();
+    }
+
+    handleSearchKeydown(event) {
+        if (this.disabled) {
+            return;
+        }
+        if (event.key === KEYS.DOWN || event.key === KEYS.UP || event.key === KEYS.ENTER) {
+            if (!this.showList) {
+                this.openList();
+                event.key === KEYS.UP ? this.highlightPreviousOption(this.highlightedOptionIndex) : this.highlightNextOption(this.highlightedOptionIndex);
+            } else {
+                if (this.options.some(option => !option.hidden)) {
+                    if (event.key === KEYS.ENTER) {
+                        this.selectOption(this.highlightedOptionIndex);
+                        this.resetSearch();
+                        this.closeList();
+                    } else {
+                        event.preventDefault();
+                        event.stopPropagation();
+                        event.key === KEYS.UP ? this.highlightPreviousOption(Number(this.highlightedOptionIndex) - 1) : this.highlightNextOption(Number(this.highlightedOptionIndex) + 1);
+                    }
+                }
+            }
+        }
+
+        if (event.key === KEYS.ESCAPE) {
+            event.preventDefault();
+            event.stopPropagation();
+            if (this.showSelectedValue) {
+                this.handleClearClick();
+            } else {
+                this.resetSearch();
+                this.closeList();
+            }
+        }
+    }
+
+    handleOptionSelect(event) {
+        this.selectOption(event.currentTarget.dataset.index);
+    }
+
+    handleOptionUnselect(event) {
+        this.unselectOption(event.target.dataset.index);
+    }
+
+    handleOptionMouseenter(event) {
+        this.highlightedOptionIndex = event.currentTarget.dataset.index;
+    }
+
+    handleOptionMouseleave() {
+        this.highlightedOptionIndex = undefined;
+    }
+
+    handleClearClick(event) {
+        // I don't know why, but without the preventDefault/stopPropagation, clicking this button sometimes passed URL parameters to the page with refreshed the page
+        event.preventDefault();
+        event.stopPropagation();
+        if (!this.disabled) {
+            if (this.notifyOnClear) {
+                this.dispatchEvent(new CustomEvent(CLEAR_REQUEST_EVENT_NAME));
+                /*
+                this.dispatchEvent(new CustomEvent(
+                    'clearrequest',
+                    // { bubbles: true, }
+                    { bubbles: true, composed: true }
+                ));
+                */
+            } else {
+                this.clearSelection();
+            }
+        }
+    }
+
+    handleSelectedValueClick() {
+        if (this.isBaseVariant) {
+            this.openList();
+            this.highlightOption(this.selectedOption.index);
+        }
+    }
+
+    handleCollapsePillContainer() {
+        this.pillContainerIsExpanded = false;
+        this.resizePillContainer();
+    }
+
+    handleExpandPillContainer() {
+        this.pillContainerIsExpanded = true;
+        this.resizePillContainer();
+    }
+
+    handleListboxScroll(event) {
+        if (!event.target)
+            return;
+        const lastDisplayedOption = this.template.querySelector('.slds-listbox__item:last-child');
+        const ul = this.template.querySelector('.slds-listbox');
+        let ot = lastDisplayedOption?.offsetTop
+        if (event.target.scrollTop + event.target.offsetHeight > ot) {
+            this.numOptionsDisplayed += LOAD_COUNT;
+            this.filterOptions();
+        }
+
+    }
+
+    /* UTILITY FUNCTIONS */
+    debounce(fn, wait) {
+        clearTimeout(this.debounceTimer);
+        this.debounceTimer = setTimeout(fn, wait);
+    }
+
+    getComboboxOption(option, index) {
+        return {
+            ...option,
+            index,
+            get comboboxClass() {
+                return 'slds-media slds-media_center slds-listbox__option slds-listbox__option_has-meta slds-listbox__option_plain' + (this.hasFocus ? ' slds-has-focus' : '');
+            }
+        }
+    }
+
+    // Lovingly "borrowed" from https://github.com/salesforce/base-components-recipes/blob/83b87d3772557a22de16f74a047a087a51c4934c/force-app/main/default/lwc/baseCombobox/baseCombobox.js#L836
+    scrollIntoViewIfNeeded(element, scrollingParent) {
+        const parentRect = scrollingParent.getBoundingClientRect();
+        const findMeRect = element.getBoundingClientRect();
+        if (findMeRect.top <= parentRect.top) {
+            if (element.offsetTop + findMeRect.height < parentRect.height) {
+                scrollingParent.scrollTop = 0;
+            } else {
+                scrollingParent.scrollTop = element.offsetTop;
+            }
+        } else if (findMeRect.bottom >= parentRect.bottom) {
+            scrollingParent.scrollTop += findMeRect.bottom - parentRect.bottom;
+        }
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_combobox/fsc_combobox.js-meta.xml b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.js-meta.xml
new file mode 100644
index 0000000..bde6546
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_combobox/fsc_combobox.js-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>52.0</apiVersion>
+    <isExposed>true</isExposed>
+    <masterLabel>Combobox</masterLabel>
+    <!-- <targets>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="label" label="Label" type="String" />
+        </targetConfig>
+    </targetConfigs> -->
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_comboboxUtils/fsc_comboboxUtils.js b/force-app/main/default/lwc/fsc_comboboxUtils/fsc_comboboxUtils.js
new file mode 100644
index 0000000..b6efa8b
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_comboboxUtils/fsc_comboboxUtils.js
@@ -0,0 +1,34 @@
+const KEYS = {
+    ESCAPE: 'Escape',
+    UP: 'ArrowUp',
+    DOWN: 'ArrowDown',
+    ENTER: 'Enter'
+}
+
+const CLEAR_REQUEST_EVENT_NAME = 'clearrequest';
+
+const setValuesFromMultipleInput = (values) => {
+    if (!values) {
+        return [];
+    } else {
+        return Array.isArray(values) ? [...values] : [values];
+    }
+}
+
+const setValuesFromSingularInput = (value, delimiter, isMultiSelect) => {
+    if (!value) {
+        return [];
+    } else {
+        return isMultiSelect ? value.split(delimiter).map(val => val.trim()) : [value];
+    }
+}
+
+const includesIgnoreCase = (valueToSearch, valueToSearchFor) => {
+    if (Array.isArray(valueToSearch)) {
+        return valueToSearch.map(arrayValue => arrayValue.toLowerCase()).includes(valueToSearchFor.toLowerCase());
+    } else {
+        return valueToSearch.toLowerCase().includes(valueToSearchFor.toLowerCase());
+    }
+}
+
+export { KEYS, setValuesFromMultipleInput, setValuesFromSingularInput, includesIgnoreCase, CLEAR_REQUEST_EVENT_NAME }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_comboboxUtils/fsc_comboboxUtils.js-meta.xml b/force-app/main/default/lwc/fsc_comboboxUtils/fsc_comboboxUtils.js-meta.xml
new file mode 100644
index 0000000..3f28286
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_comboboxUtils/fsc_comboboxUtils.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <isExposed>false</isExposed>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.html b/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.html
new file mode 100644
index 0000000..77e8989
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.html
@@ -0,0 +1,28 @@
+<template>
+    <c-fsc_combobox
+        name={name}
+        options={fields} 
+        label={label} 
+        values={values} 
+        public-class={publicClass} 
+        public-style={publicStyle} 
+        show-selected-count={showSelectedCount}
+        required={required} 
+        allow-multiselect={allowMultiselect} 
+        is-loading={isLoading} 
+        placeholder={computedPlaceholder}
+        onchange={handleComboboxChange} 
+        disabled={isLoadingOrDisabled}
+        value-delimiter={valueDelimiter}
+        hide-pills={hidePills}
+        exclude-sublabel-in-filter={excludeSublabelInFilter}
+        include-value-in-filter={includeValueInFilter}
+        icon-size="x-small"
+        field-level-help={fieldLevelHelp}
+        error-message={errorMessage}
+        builder-context={builderContext}
+        notify-on-clear={notifyOnClear}
+        onclearrequest={handleClearRequest}
+        include-full-details={includeFullDetails}
+        ></c-fsc_combobox>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.js b/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.js
new file mode 100644
index 0000000..47eacc1
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.js
@@ -0,0 +1,263 @@
+import { LightningElement, api, track, wire } from 'lwc';
+import { getObjectInfo } from 'lightning/uiObjectInfoApi';
+import getObjectFields from '@salesforce/apex/ObjectFieldSelectorController.getObjectFields';
+import { DISPLAY_TYPE_OPTIONS, AVAILABLE_OBJECT_OPTIONS, FIELD_TYPES, LAYOUT_OPTIONS, transformConstantObject } from 'c/fsc_objectFieldSelectorUtils';
+import { setValuesFromMultipleInput, setValuesFromSingularInput, includesIgnoreCase, CLEAR_REQUEST_EVENT_NAME } from 'c/fsc_comboboxUtils';
+
+const COMBOBOX_COMPONENT_NAME = 'c-fsc_combobox';
+
+const DATA_TYPE_ICONS = {
+    Address: 'utility:location',
+    Boolean: 'utility:check',
+    ComboBox: 'utility:picklist_type',
+    Currency: 'utility:currency',
+    Date: 'utility:date_input',
+    DateTime: 'utility:date_time',
+    Double: 'utility:number_input',
+    Email: 'utility:email',
+    Int: 'utility:number_input',
+    Location: 'utility:location',
+    MultiPicklist: 'utility:multi_picklist',
+    Percent: 'utility:percent',
+    Phone: 'utility:phone_portrait',
+    Picklist: 'utility:picklist_type',
+    Reference: 'utility:record_lookup',
+    Time: 'utility:clock',
+    Url: 'utility:link'
+}
+const DEFAULT_ICON = 'utility:text';
+
+const INVALID_TYPE_ERROR = 'INVALID_TYPE';
+
+export default class Fsc_fieldSelector2 extends LightningElement {
+    @api name;
+    @api allowMultiselect = false;
+    @api required = false;
+    @api label = 'Select Field';
+    @api showSelectedCount;
+    @api publicClass;
+    @api publicStyle;
+    @api placeholder = 'Type to search fields';
+    @api fieldLevelHelp;
+    @api valueDelimiter = ',';
+    @api fieldTypeDelimiter = ';'; // Sometimes an array of availableFieldTypes will contain more than one field type value in a single element, so this allows a separate delimiter to be used to split within the element
+    @api hideIcons = false;
+    @api isLoading = false;
+    @api disabled = false;
+    @api hidePills = false; // If true, list of selected pills in multiselect mode will not be displayed (generally because a parent component wants to display them differently).
+    @api excludeSublabelInFilter = false;   // If true, the 'sublabel' text of an option is not included when determining if an option is a match for a given search text.
+    @api includeValueInFilter = false;  // If true, the 'value' text of an option is included when determining if an option is a match for a given search text.
+    @api allowReferenceLookups = false; 
+    @api defaultToNameField = false;
+    @api notifyOnClear = false;
+    @api includeFullDetails = false;
+    @track fields = [];
+    @track _values = [];
+    @track _availableFieldTypes = [];
+    @track _availableReferenceTypes = []; 
+
+    @api builderContext;
+
+    fieldTypes = transformConstantObject(FIELD_TYPES);
+    _objectName;
+    isNotFirstObjectLoad;
+    errorMessage;
+
+    @api
+    get objectName() {
+        return this._objectName;
+    }
+    set objectName(value) {
+        this._objectName = value;
+        if (!this.objectName) {
+            this.clearValues();
+        }
+    }
+
+    @api
+    get values() {
+        return this._values || [];
+    }
+    set values(values) {
+        this._values = setValuesFromMultipleInput(values);
+    }
+    @track _values = [];
+
+    @api
+    get value() {
+        return this.values.join(this.valueDelimiter);
+    }
+    set value(value) {
+        this.values = setValuesFromSingularInput(value, this.valueDelimiter, this.allowMultiselect);
+    }
+
+    @api
+    get availableFieldTypes() {
+        return this._availableFieldTypes;
+    }
+    set availableFieldTypes(value) {
+        if (!value) {
+            this._availableFieldTypes = [];
+        } else if (Array.isArray(value)) {
+            this._availableFieldTypes = value;
+        } else {
+            let types = [];
+            value.split(this.valueDelimiter).forEach(value => {
+                types.push(...value.split(this.fieldTypeDelimiter).map(fieldType => fieldType.toLowerCase()));
+            })
+            this._availableFieldTypes = types;
+        }
+    }
+
+    @api
+    get availableReferenceTypes() {
+        return this._availableReferenceTypes;
+    }
+    set availableReferenceTypes(value) {
+        if (!value) {
+            this.values = [];
+        } else {
+            this._availableReferenceTypes = value.split(this.valueDelimiter).map(val => val.trim());
+        }
+    }
+
+    @api
+    reportValidity() {
+        return this.combobox.reportValidity();
+    }
+
+    @api
+    validate() {
+        return this.combobox.validate();
+    }
+
+    @api
+    clearSelection() {
+        this.combobox.clearSelection();
+    }
+
+    get isLoadingOrDisabled() {
+        return this.isLoading || this.disabled || !this.objectName;
+    }
+
+    get computedPlaceholder() {
+        if (!this.objectName) {
+            return 'No object selected, please select an object';
+        } else if (this.isLoading) {
+            return 'Loading...';
+        } else {
+            return this.placeholder;
+        }
+    }
+
+    get combobox() {
+        return this.template.querySelector(COMBOBOX_COMPONENT_NAME);
+    }
+    
+    @wire(getObjectInfo, { objectApiName: '$objectName' })
+    handleGetObjectInfo({ error, data }) {
+        if (error) {
+            console.log('Fieldselector error: ' + JSON.stringify(error));
+            if (error.body.errorCode === INVALID_TYPE_ERROR) {
+                this.loadObjectInfo();
+            } else {
+                this.errorMessage = 'Unknown error';
+                if (Array.isArray(error.body)) {
+                    this.errorMessage = error.body.map(e => e.message).join(', ');
+                } else if (typeof error.body.message === 'string') {
+                    this.errorMessage = error.body.message;
+                }
+            }
+        } else if (data) {
+            // console.log(JSON.stringify(Object.values(data.fields).filter(field => field.relationshipName)[0]));
+            this.processFields(Object.values(data.fields));
+        } else {
+            // console.log('neither data nor error');
+        }
+        this.isLoading = false;
+    }
+
+    loadObjectInfo() {
+        if (!this.objectName || this.isNotFirstObjectLoad) {
+            this.clearValues();
+        }
+        if (this.objectName) {
+            this.isLoading = true;
+            this.disabled = false;
+            this.isNotFirstObjectLoad = true;
+            getObjectFields({ objectName: this.objectName })
+                .then(result => {
+                    this.processFields(result.fields);
+                }).catch(error => {
+                    console.log('getObjectFields error: ' + JSON.stringify(error));
+                    this.errorMessage = error.errorMessage || 'Unknown error';
+                }).finally(() => {
+                    this.isLoading = false;
+                    console.log('finished loadObjectInfo');
+                })
+        }
+    }
+
+    /* EVENT HANDLERS */
+    handleComboboxChange(event) {
+        this.values = event.detail.values;
+        this.dispatchFields();
+    }
+
+    handleClearRequest() {
+        this.dispatchEvent(new CustomEvent(CLEAR_REQUEST_EVENT_NAME));
+    }
+
+    /* ACTION FUNCTIONS */
+    processFields(fields) {
+        if (this.availableFieldTypes?.length) {
+            fields = fields.filter(field => includesIgnoreCase(this.availableFieldTypes, field.dataType));
+            if (this.availableReferenceTypes?.length) {
+                fields = fields.filter(field => !field.referenceToInfos.length || field.referenceToInfos.some(ref => includesIgnoreCase(this.availableReferenceTypes, ref.apiName)));
+            }
+        }
+        this.fields = fields.map(field => this.newField(field.label, field.apiName, field.apiName, this.hideIcons ? null : this.getIconFromDataType(field.dataType), field.nameField, field.dataType));
+        this.fields.sort((a, b) => {
+            return a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1;
+        });
+        if (this.defaultToNameField && !this.value) {
+            // First check to see if "Name" is a valid name field, as some objects like Contact have multiple name fields
+            let nameField = this.fields.find(field => field.value === 'Name' && field.nameField) || this.fields.find(field => field.nameField);
+            if (nameField) {
+                this.value = nameField.value;
+                this.dispatchFields();
+            }
+        }
+
+    }
+
+    clearValues() {
+        console.log('in clearValues');
+        if (this.values.length) {
+            console.log('actually clearing because there are values to clear (' + this.values + ')');
+            this.values = [];
+            this.dispatchFields();
+        }
+    }
+
+    dispatchFields() {
+        let detail = {
+            value: this.value,
+            values: this.values,
+        }
+        if (this.includeFullDetails) {
+            detail.selectedFields = this.fields.filter(field => this.values.includes(field.value));
+        }
+        this.dispatchEvent(new CustomEvent('change', { detail }));
+    }    
+
+    /* UTILITY FUNCTIONS */
+    getIconFromDataType(type) {
+        let matchingType = this.fieldTypes.options.find(fieldType => includesIgnoreCase(fieldType.value.split(this.fieldTypeDelimiter), type));
+        return matchingType?.icon || DEFAULT_ICON;
+    }
+
+    newField(label, sublabel, value, icon, nameField, dataType) {
+        return { label, sublabel, value, icon, nameField, dataType };
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.js-meta.xml b/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.js-meta.xml
new file mode 100644
index 0000000..884004a
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_fieldSelector2/fsc_fieldSelector2.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>52.0</apiVersion>
+    <isExposed>false</isExposed>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.html b/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.html
new file mode 100644
index 0000000..ae981eb
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.html
@@ -0,0 +1,30 @@
+<template>
+    <div class="slds-grid slds-wrap slds-gutters">
+        <template if:true={masterLabel}>
+            <div class="slds-col slds-size_1-of-1">
+                <legend class="slds-form-element__legend slds-form-element__label">{masterLabel}</legend>
+            </div>
+        </template>
+        <div class={computedColClass}>
+            <template if:false={hideObjectPicklist}>
+                <c-fsc_object-selector name="objectSelector" allow-multiselect={objectAllowMultiselect}
+                    label={objectLabel} required={required} available-object-selection={availableObjectSelection}
+                    available-objects={availableObjects} disabled={objectPicklistIsDisabled}
+                    onchange={handleObjectChange} value={objectValue} builder-context={builderContext} notify-on-clear={notifyOnClear}
+                    onclearrequest={handleObjectClearRequest} include-full-details={includeFullDetails}>
+                </c-fsc_object-selector>
+            </template>
+        </div>
+        <div class={computedColClass}>
+            <template if:false={hideFieldPicklist}>
+                <c-fsc_field-selector2 name="fieldSelector" label={fieldLabel} required={required}
+                    allow-multiselect={fieldAllowMultiselect} object-name={objectValue}
+                    available-field-types={availableFieldTypes} available-reference-types={availableReferenceTypes}
+                    default-to-name-field={defaultToNameField} disabled={fieldPicklistIsDisabled}
+                    onchange={handleFieldChange} value={fieldValue} builder-context={builderContext} notify-on-clear={notifyOnClear}
+                    onclearrequest={handleFieldClearRequest} include-full-details={includeFullDetails}>
+                </c-fsc_field-selector2>
+            </template>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.js b/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.js
new file mode 100644
index 0000000..bcbf6f7
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.js
@@ -0,0 +1,201 @@
+import { LightningElement, api, track } from 'lwc';
+// import { FlowAttributeChangeEvent } from 'lightning/flowSupport';
+
+import { DISPLAY_TYPE_OPTIONS, AVAILABLE_OBJECT_OPTIONS, FIELD_TYPES, LAYOUT_OPTIONS, transformConstantObject } from 'c/fsc_objectFieldSelectorUtils';
+import { setValuesFromMultipleInput, setValuesFromSingularInput } from 'c/fsc_comboboxUtils';
+
+export default class Fsc_objectFieldSelector extends LightningElement {
+    availableObjectOptions = transformConstantObject(AVAILABLE_OBJECT_OPTIONS);
+
+    @api name;
+    @api masterLabel;
+    @api objectLabel = 'Select Object';
+    @api fieldLabel = 'Select Field';
+    @api valueDelimiter = ',';
+
+    @api disabled;
+    @api disableObjectPicklist = false;
+    @api disableFieldPicklist = false;
+    @api hideObjectPicklist = false;
+    @api hideFieldPicklist = false;
+    @api objectAllowMultiselect = false;
+    @api fieldAllowMultiselect = false;
+    @api required = false;
+    @api notifyOnClear = false;
+    @api includeFullDetails = false;
+
+    @api availableObjectSelection = this.availableObjectOptions.default?.value;
+    @api availableObjects;
+    @api availableFieldTypes;
+    @api availableReferenceTypes;
+    // @api lockDefaultObject;  Redundant, same as disableObjectPicklist
+    @api defaultToNameField;
+    @api layout = LAYOUT_OPTIONS.VERTICAL.value;
+
+    @track selectedObjects = [];
+    @track selectedFields = [];
+
+
+    @api
+    get builderContext() {
+        return this._builderContext;
+    }
+    set builderContext(value) {
+        console.log('setting builderContext');
+        console.log(JSON.stringify(value));
+        this._builderContext = value;
+    }
+    _builderContext;
+
+    @api
+    get objectValues() {
+        return this._objectValues || [];
+    }
+    set objectValues(values) {
+        this._objectValues = setValuesFromMultipleInput(values);
+    }
+    @track _objectValues = [];
+
+    @api
+    get objectValue() {
+        return this.objectValues.join(this.valueDelimiter);
+    }
+    set objectValue(value) {
+        this.objectValues = setValuesFromSingularInput(value, this.valueDelimiter, this.objectAllowMultiselect);
+    }
+
+    @api
+    get fieldValues() {
+        return this._fieldValues || [];
+    }
+    set fieldValues(values) {
+        this._fieldValues = setValuesFromMultipleInput(values);
+    }
+    @track _fieldValues = [];
+
+    @api
+    get fieldValue() {
+        return this.fieldValues.join(this.valueDelimiter);
+    }
+    set fieldValue(value) {
+        this.fieldValues = setValuesFromSingularInput(value, this.valueDelimiter, this.fieldAllowMultiselect);
+    }
+
+
+    @api
+    get displayType() {
+        return this._displayType;
+    }
+    set displayType(value) {
+        this._displayType = value;
+        if (this.displayType === DISPLAY_TYPE_OPTIONS.FIELD.value) {
+            this.hideObjectPicklist = true;
+        }
+        if (this.displayType === DISPLAY_TYPE_OPTIONS.OBJECT.value) {
+            this.hideFieldPicklist = true;
+        }
+    }
+    _displayType = DISPLAY_TYPE_OPTIONS.BOTH.value;
+
+    @api
+    reportValidity() {
+        let isValid = true;
+        if (this.objectSelector) {
+            isValid = this.objectSelector.reportValidity() && isValid;
+        }
+        if (this.fieldSelector) {
+            isValid = this.fieldSelector.reportValidity() && isValid;
+        }
+        return isValid;
+    }
+
+    @api
+    validate() {
+        let errorMessages = []
+        const validateComponents = [this.objectSelector, this.fieldSelector];
+        validateComponents.forEach(cmp => {
+            if (cmp?.validate().errorMessage) {
+                errorMessages.push(cmp.validate().errorMessage)
+            }
+        })
+        console.log('in ofsValidate, errorMessages = ' + errorMessages);
+        if (errorMessages.length) {
+            return {
+                isValid: false,
+                errorMessage: errorMessages.join(' ')
+            };
+        } else {
+            return { isValid: true };
+        }
+    }
+
+    @api
+    clearFieldSelection() {
+        this.fieldSelector.clearSelection();
+    }
+
+    @api
+    clearObjectSelection() {
+        this.objectSelector.clearSelection();
+    }
+
+    get computedColClass() {
+        let classString = 'slds-col';
+        if (this.displayType === DISPLAY_TYPE_OPTIONS.BOTH.value && this.layout === LAYOUT_OPTIONS.HORIZONTAL.value) {
+            classString += ' slds-size_1-of-2';
+        } else {
+            classString += ' slds-size_1-of-1';
+        }
+        return classString;
+    }
+
+    get objectSelector() {
+        return this.template.querySelector('c-fsc_object-selector');
+    }
+
+    get fieldSelector() {
+        return this.template.querySelector('c-fsc_field-selector2');
+    }
+
+    get objectPicklistIsDisabled() {
+        return this.disableObjectPicklist || this.disabled;
+    }
+
+    get fieldPicklistIsDisabled() {
+        return this.disableFieldPicklist || this.disabled;
+    }
+
+    handleObjectChange(event) {
+        this.objectValue = event.detail.value;
+        this.selectedObjects = event.detail.selectedObjects;
+        this.dispatchValues();
+    }
+
+    handleFieldChange(event) {
+        this.fieldValue = event.detail.value;
+        this.selectedFields = event.detail.selectedFields;
+        this.dispatchValues();
+    }
+
+    handleFieldClearRequest() {
+        this.dispatchEvent(new CustomEvent('fieldclearrequest'));
+    }
+
+    handleObjectClearRequest() {
+        this.dispatchEvent(new CustomEvent('objectclearrequest'));
+    }
+
+    dispatchValues() {
+        let detail = {
+            objectValue: this.objectValue,
+            objectValues: this.objectValues,
+            fieldValue: this.fieldValue,
+            fieldValues: this.fieldValues
+        }
+        if (this.includeFullDetails) {
+            detail.selectedObjects = this.selectedObjects;
+            detail.selectedFields = this.selectedFields;
+        }
+        this.dispatchEvent(new CustomEvent('change', { detail }));
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.js-meta.xml b/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.js-meta.xml
new file mode 100644
index 0000000..dffefe2
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectFieldSelector/fsc_objectFieldSelector.js-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <isExposed>true</isExposed>
+    <masterLabel>Object and Field Selector</masterLabel>
+    <!-- <targets>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen" configurationEditor="c-fsc_object-field-selector-cpe">
+            <property name="masterLabel" label="Component Label" type="String" />
+            <property name="objectLabel" label="Object Label" type="String" />
+            <property name="fieldLabel" label="Field Label" type="String" />
+            <property name="required" label="Required" type="String" />
+            <property name="availableObjectSelection" label="Available Object Selection" type="String" />
+            <property name="availableObjects" label="Available Object Selection" type="String" />
+            <property name="lockDefaultObject" label="Lock Default Object" type="String" />
+            <property name="displayType" label="Display Type" type="String" />
+            <property name="fieldAllowMultiselect" label="Field Multiselect" type="String" />
+            <property name="objectAllowMultiselect" label="Object Multiselect" type="String" />
+            <property name="availableFieldTypes" label="Allowed Field Types" type="String" />
+            <property name="availableReferenceTypes" label="Allowed Reference Types" type="String" />
+            <property name="layout" label="Layout Style" type="String" />
+            <property name="objectValue" label="Selected Object (string)" type="String" />
+            <property name="fieldValue" label="Selected Field (string)" type="String" />
+            <property name="objectValues" label="Selected Objects" type="String[]" />
+            <property name="fieldValues" label="Selected Fields" type="String[]" />
+            </targetConfig>
+    </targetConfigs> -->
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectFieldSelectorUtils/fsc_objectFieldSelectorUtils.js b/force-app/main/default/lwc/fsc_objectFieldSelectorUtils/fsc_objectFieldSelectorUtils.js
new file mode 100644
index 0000000..8e5e25a
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectFieldSelectorUtils/fsc_objectFieldSelectorUtils.js
@@ -0,0 +1,58 @@
+const FIELD_TYPES = {
+    REFERENCE: { label: 'Lookup/Master-Detail', value: 'Reference', icon: 'utility:record_lookup' },
+    ADDRESS: { label: 'Address', value: 'Address', icon: 'utility:location' },
+    CHECKBOX: { label: 'Checkbox', value: 'Boolean', icon: 'utility:check' },
+    CURRENCY: { label: 'Currency', value: 'Currency', icon: 'utility:currency' },
+    DATE: { label: 'Date', value: 'Date', icon: 'utility:date_input' },
+    DATETIME: { label: 'Date/Time', value: 'DateTime', icon: 'utility:date_time' },
+    EMAIL: { label: 'Email', value: 'Email', icon: 'utility:email' },
+    LOCATION: { label: 'Geolocation', value: 'Location', icon: 'utility:location' },
+    NUMBER: { label: 'Number', value: 'Integer;Double;Int;Long', icon: 'utility:number_input' },
+    PERCENT: { label: 'Percent', value: 'Percent', icon: 'utility:percent' },
+    PHONE: { label: 'Phone Number', value: 'Phone', icon: 'utility:phone_portrait' },
+    PICKLIST: { label: 'Picklist', value: 'Picklist;ComboBox', icon: 'utility:picklist_type' },
+    MULTIPICKLIST: { label: 'Picklist (Multi-Select)', value: 'MultiPicklist', icon: 'utility:multi_picklist' },
+    TEXT: { label: 'Text', value: 'String', icon: 'utility:text' },
+    TEXTAREA: { label: 'Text Area', value: 'TextArea', icon: 'utility:textbox' },
+    TEXTENCRYPTED: { label: 'Text (Encrypted)', value: 'EncryptedString', icon: 'utility:hide' },
+    TIME: { label: 'Time', value: 'Time', icon: 'utility:clock' },
+    URL: { label: 'URL', value: 'URL', icon: 'utility:link' },
+};
+
+const DISPLAY_TYPE_OPTIONS = {
+    OBJECT: { label: 'Just Object(s)', value: 'object' },
+    FIELD: { label: 'Just Field(s)', value: 'field' },
+    BOTH: { label: 'Both', value: 'both', default: true }
+}
+
+const AVAILABLE_OBJECT_OPTIONS = {
+    BOTH: { label: 'Custom and Standard Objects', value: 'both', subcategories: ['standard', 'custom'], default: true },
+    STANDARD: { label: 'Standard Objects Only', value: 'standard' },
+    CUSTOM: { label: 'Custom Objects Only', value: 'custom' },
+    ALL:  { label: 'ALL Objects (advanced)', value: 'all', subcategories: ['standard', 'custom', 'ancillary'] },
+    ANCILLARY:  { label: 'Ancillary Objects Only', value: 'ancillary', hide: true },
+    SPECIFIC:  { label: 'Select Specific Objects', value: 'specific' }    
+}
+
+const LAYOUT_OPTIONS = {
+    VERTICAL: { label: 'Vertical', value: 'vertical', default: true},
+    HORIZONTAL: { label: 'Horizontal', value: 'horizontal' },
+}
+
+const transformConstantObject = (constant) => {
+    return {
+        list: constant,
+        get options() { return Object.values(this.list).filter(option => !option.hide); },
+        get default() { return this.options.find(option => option.default); },
+        findFromValue: function (value) {
+            let entry = this.options.find(option => option.value == value);
+            return entry || this.default;
+        },
+        findFromLabel: function (label) {
+            let entry = this.options.find(option => option.label == label);
+            return entry || this.default;
+        }
+    }
+}
+
+export { FIELD_TYPES, DISPLAY_TYPE_OPTIONS, AVAILABLE_OBJECT_OPTIONS, LAYOUT_OPTIONS, transformConstantObject }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectFieldSelectorUtils/fsc_objectFieldSelectorUtils.js-meta.xml b/force-app/main/default/lwc/fsc_objectFieldSelectorUtils/fsc_objectFieldSelectorUtils.js-meta.xml
new file mode 100644
index 0000000..3f28286
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectFieldSelectorUtils/fsc_objectFieldSelectorUtils.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <isExposed>false</isExposed>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.html b/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.html
new file mode 100644
index 0000000..84cd801
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.html
@@ -0,0 +1,28 @@
+<template>
+    <c-fsc_combobox 
+        name={name}
+        options={objectOptions} 
+        label={label} 
+        values={values} 
+        public-class={publicClass} 
+        public-style={publicStyle} 
+        show-selected-count={showSelectedCount}
+        required={required} 
+        allow-multiselect={allowMultiselect} 
+        is-loading={isLoading} 
+        placeholder={computedPlaceholder}
+        onchange={handleComboboxChange} 
+        disabled={disabled}
+        value-delimiter={valueDelimiter}
+        hide-pills={hidePills}
+        exclude-sublabel-in-filter={excludeSublabelInFilter}
+        include-value-in-filter={includeValueInFilter}
+        icon-size="x-small"
+        field-level-help={fieldLevelHelp}
+        builder-context={builderContext}
+        variant={variant}
+        notify-on-clear={notifyOnClear}
+        onclearrequest={handleClearRequest}
+        include-full-details={includeFullDetails}
+    ></c-fsc_combobox>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.js b/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.js
new file mode 100644
index 0000000..04eb92c
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.js
@@ -0,0 +1,179 @@
+import { LightningElement, wire, track, api } from 'lwc';
+import getObjects from '@salesforce/apex/ObjectFieldSelectorController.getObjects';
+import { DISPLAY_TYPE_OPTIONS, AVAILABLE_OBJECT_OPTIONS, FIELD_TYPES, LAYOUT_OPTIONS, transformConstantObject } from 'c/fsc_objectFieldSelectorUtils';
+import { setValuesFromMultipleInput, setValuesFromSingularInput, CLEAR_REQUEST_EVENT_NAME } from 'c/fsc_comboboxUtils';
+
+const ANCILLARY_SUFFIXES = ['Feed', 'Tag', 'Share', 'ChangeEvent', 'History'];
+const COMBOBOX_COMPONENT_NAME = 'c-fsc_combobox';
+export default class Fsc_objectSelector extends LightningElement {
+    availableObjectOptions = transformConstantObject(AVAILABLE_OBJECT_OPTIONS);
+
+    @api name;
+    @api allowMultiselect = false;
+    @api required = false;
+    @api label = 'Select Object';
+    @api placeholder = 'Type to search objects';
+    @api showSelectedCount;
+    @api publicClass;
+    @api publicStyle;
+    @api fieldLevelHelp;
+    @api variant;
+    @api hideIcons = false;
+    @api valueDelimiter = ',';
+    @api isLoading = false;
+    @api disabled = false;
+    @api hidePills = false; // If true, list of selected pills in multiselect mode will not be displayed (generally because a parent component wants to display them differently).
+    @api excludeSublabelInFilter = false;   // If true, the 'sublabel' text of an option is not included when determining if an option is a match for a given search text.
+    @api includeValueInFilter = false;  // If true, the 'value' text of an option is included when determining if an option is a match for a given search text.    
+    @api notifyOnClear = false;
+    @api includeFullDetails = false;
+    // @api availableObjectSelection = this.availableObjectOptions.default?.value;
+    @api availableObjects = [];
+    
+    @api builderContext;
+
+    hasConnected = false;
+    @track allOptions = [];
+    @track loadedCategories = [];
+
+    @api
+    get values() {
+        return this._values || [];
+    }
+    set values(values) {
+        this._values = setValuesFromMultipleInput(values);
+    }
+    @track _values = [];
+
+    @api
+    get value() {
+        return this.values.join(this.valueDelimiter);
+    }
+    set value(value) {
+        this.values = setValuesFromSingularInput(value, this.valueDelimiter, this.allowMultiselect);
+    }
+
+    @api
+    get availableObjectSelection() {
+        return this._availableObjectSelection;
+    }
+    set availableObjectSelection(value) {
+        // console.log(' in set availableObjectSelection to ' + value);
+        this._availableObjectSelection = value;
+        if (this.hasConnected && this.values.length) {
+            this.values = [];
+            this.dispatchObjects();
+        }
+        // if (!this.loadedCategories.includes(this.availableObjectSelection)) {
+        //     this.loadObjectCategory(this.availableObjectSelection);
+        // }
+    }
+    _availableObjectSelection = this.availableObjectOptions.default?.value;
+
+    get objectOptions() {
+        return this.allOptions.filter(option => {
+            if (this.availableObjectSelection === AVAILABLE_OBJECT_OPTIONS.SPECIFIC.value) {
+                return this.availableObjects?.includes(option.value);
+            } else {
+                return this.matchesObjectCategory(option.category);
+            }
+        });
+    }
+
+    get computedPlaceholder() {
+        return this.isLoading ? 'Loading...' : this.placeholder;
+    }
+
+    get combobox() {
+        return this.template.querySelector(COMBOBOX_COMPONENT_NAME);
+    }
+
+    // @api
+    // get availableObjects() {
+    //     return this._availableObjects;
+    // }
+    // set availableObjects(value) {
+    //     this._availableObjects = value;
+    //     if(this.hasConnected)
+    //         this.loadObjects();
+    // }
+    // _availableObjects = []
+
+    addObjectOptions(options, category) {
+        let newOptions = options.map(objectType => {
+            return {
+                category,
+                label: objectType.label,
+                sublabel: objectType.value,
+                value: objectType.value,
+            }
+        });
+        this.allOptions = [...this.allOptions, ...newOptions].sort((a, b) => {
+            return a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1;
+        });
+    }
+
+    loadObjectCategory(category) {
+        // if (!this.value) {
+        //     this.isLoading = true;
+        // }
+        getObjects({ selectionType: category })
+            .then(result => {
+                this.addObjectOptions(result.objects, category);
+                if (!this.value || this.objectOptions.find(option => option.value == this.value)) {
+                    this.isLoading = false;
+                }
+            });
+    }
+
+    @api
+    reportValidity() {
+        return this.combobox.reportValidity();
+    }
+
+    @api
+    validate() {
+        return this.combobox.validate();
+    }
+
+    @api
+    clearSelection() {
+        this.combobox.clearSelection();
+    }
+
+    connectedCallback() {
+        this.hasConnected = true;
+        this.isLoading = true;
+        let initialLoadCategories = [AVAILABLE_OBJECT_OPTIONS.STANDARD.value, AVAILABLE_OBJECT_OPTIONS.CUSTOM.value, AVAILABLE_OBJECT_OPTIONS.ANCILLARY.value];
+        initialLoadCategories.forEach(category => {
+            this.loadObjectCategory(category);
+        });
+    }
+
+    handleComboboxChange(event) {
+        this.values = event.detail.values;
+        this.dispatchObjects();
+    }
+
+    handleClearRequest() {
+        console.log(`in objectSelector handleClearRequest`);
+        this.dispatchEvent(new CustomEvent(CLEAR_REQUEST_EVENT_NAME));
+    }
+
+    dispatchObjects() {
+        let detail = {
+            value: this.value,
+            values: this.values,
+        }
+        if (this.includeFullDetails) {
+            detail.selectedObjects = this.objectOptions.filter(object => this.values.includes(object.value));
+        }
+        this.dispatchEvent(new CustomEvent('change', { detail }));
+    }
+
+    matchesObjectCategory(category) {
+        return category === this.availableObjectSelection ||
+            this.availableObjectSelection === AVAILABLE_OBJECT_OPTIONS.ALL.value ||
+            (this.availableObjectSelection === AVAILABLE_OBJECT_OPTIONS.BOTH.value && (category === AVAILABLE_OBJECT_OPTIONS.STANDARD.value || category === AVAILABLE_OBJECT_OPTIONS.CUSTOM.value))
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.js-meta.xml b/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.js-meta.xml
new file mode 100644
index 0000000..ba22d67
--- /dev/null
+++ b/force-app/main/default/lwc/fsc_objectSelector/fsc_objectSelector.js-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <isExposed>true</isExposed>
+    <targets>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="disabled" label="Disabled" type="Boolean" />
+            <property name="allowMultiselect" label="Allow Multiselect" type="Boolean" />
+            <property name="publicClass" label="SLDS Class Styling" type="String" />
+        </targetConfig>
+    </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/iconSelector/iconSelector.html b/force-app/main/default/lwc/iconSelector/iconSelector.html
new file mode 100644
index 0000000..b8a5e2f
--- /dev/null
+++ b/force-app/main/default/lwc/iconSelector/iconSelector.html
@@ -0,0 +1,45 @@
+<!-- 
+    
+Lightning Web Component for Flow Screens & CPE:     fsc_pickIcon
+
+This component allows the user to display and select a Salesforce icon
+
+    Additional components packaged with this LWC:
+
+                        Lightning Web Components:   fsc_searchableDataTable
+
+                        Apex Classes:               
+
+                        Flows:                      
+
+                        Apex Pages:                 
+
+                        Custom Applications:        
+
+CREATED BY:         Eric Smith
+
+CREDITS:            Based on code in a Salesforce Labs App (Activity Timeline)
+                    https://appexchange.salesforce.com/appxListingDetail?listingId=a0N3A00000G0yN3UAJ
+
+VERSION:            (See latest FlowScreenComponentsBasePack)
+
+RELEASE NOTES:      
+
+06/03/21 -  Eric Smith -        FlowScreenCOmponentsBasePack Version 2.3.5
+Updates:    Added all Icons available as of 5/27/21 (LDS Release 2.15.8)
+
+06/02/21 -  David Fromstein -   FlowScreenCOmponentsBasePack Version 2.3.4
+Updates:    Added a Searchable combobox option and a CPE
+
+04/10/21 -  Eric Smith -    Version 1.1.0
+Updates:    Added an option to hide the Actions Icons
+            Added an option to display sections in accordion mode (default is in tab mode)
+            Note: Accordion looks better in a CPE but takes longer to load
+
+12/29/20 -  Eric Smith -    Version 1.0.0
+
+-->
+
+<template>
+    <c-fsc_combobox label={label} options={iconOptions} onchange={handleComboboxChange} value={iconName} icon-size="small"></c-fsc_combobox>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/iconSelector/iconSelector.js b/force-app/main/default/lwc/iconSelector/iconSelector.js
new file mode 100644
index 0000000..3f199ab
--- /dev/null
+++ b/force-app/main/default/lwc/iconSelector/iconSelector.js
@@ -0,0 +1,1406 @@
+import { LightningElement, track, api } from 'lwc';
+
+const TABLE_STYLE = "height: 400px; width:99%";
+
+// Icons updated 6/3/21
+// Lightning Design System Release 2.15.8 - May 27, 2021 
+
+const ACTION_ICONS = [
+    { 'iconName': 'action:add_contact', 'id': 'action:add_contact' },
+    { 'iconName': 'action:add_file', 'id': 'action:add_file' },
+    { 'iconName': 'action:add_photo_video', 'id': 'action:add_photo_video' },
+    { 'iconName': 'action:add_relationship', 'id': 'action:add_relationship' },
+    { 'iconName': 'action:adjust_value', 'id': 'action:adjust_value' },
+    { 'iconName': 'action:announcement', 'id': 'action:announcement' },
+    { 'iconName': 'action:apex', 'id': 'action:apex' },
+    { 'iconName': 'action:approval', 'id': 'action:approval' },
+    { 'iconName': 'action:back', 'id': 'action:back' },
+    { 'iconName': 'action:bug', 'id': 'action:bug' },
+    { 'iconName': 'action:call', 'id': 'action:call' },
+    { 'iconName': 'action:canvas', 'id': 'action:canvas' },
+    { 'iconName': 'action:change_owner', 'id': 'action:change_owner' },
+    { 'iconName': 'action:change_record_type', 'id': 'action:change_record_type' },
+    { 'iconName': 'action:check', 'id': 'action:check' },
+    { 'iconName': 'action:clone', 'id': 'action:clone' },
+    { 'iconName': 'action:close', 'id': 'action:close' },
+    { 'iconName': 'action:defer', 'id': 'action:defer' },
+    { 'iconName': 'action:delete', 'id': 'action:delete' },
+    { 'iconName': 'action:description', 'id': 'action:description' },
+    { 'iconName': 'action:dial_in', 'id': 'action:dial_in' },
+    { 'iconName': 'action:download', 'id': 'action:download' },
+    { 'iconName': 'action:edit_groups', 'id': 'action:edit_groups' },
+    { 'iconName': 'action:edit_relationship', 'id': 'action:edit_relationship' },
+    { 'iconName': 'action:edit', 'id': 'action:edit' },
+    { 'iconName': 'action:email', 'id': 'action:email' },
+    { 'iconName': 'action:fallback', 'id': 'action:fallback' },
+    { 'iconName': 'action:filter', 'id': 'action:filter' },
+    { 'iconName': 'action:flow', 'id': 'action:flow' },
+    { 'iconName': 'action:follow', 'id': 'action:follow' },
+    { 'iconName': 'action:following', 'id': 'action:following' },
+    { 'iconName': 'action:freeze_user', 'id': 'action:freeze_user' },
+    { 'iconName': 'action:goal', 'id': 'action:goal' },
+    { 'iconName': 'action:google_news', 'id': 'action:google_news' },
+    { 'iconName': 'action:info', 'id': 'action:info' },
+    { 'iconName': 'action:join_group', 'id': 'action:join_group' },
+    { 'iconName': 'action:lead_convert', 'id': 'action:lead_convert' },
+    { 'iconName': 'action:leave_group', 'id': 'action:leave_group' },
+    { 'iconName': 'action:log_a_call', 'id': 'action:log_a_call' },
+    { 'iconName': 'action:log_event', 'id': 'action:log_event' },
+    { 'iconName': 'action:manage_perm_sets', 'id': 'action:manage_perm_sets' },
+    { 'iconName': 'action:map', 'id': 'action:map' },
+    { 'iconName': 'action:more', 'id': 'action:more' },
+    { 'iconName': 'action:new_account', 'id': 'action:new_account' },
+    { 'iconName': 'action:new_campaign', 'id': 'action:new_campaign' },
+    { 'iconName': 'action:new_case', 'id': 'action:new_case' },
+    { 'iconName': 'action:new_child_case', 'id': 'action:new_child_case' },
+    { 'iconName': 'action:new_contact', 'id': 'action:new_contact' },
+    { 'iconName': 'action:new_event', 'id': 'action:new_event' },
+    { 'iconName': 'action:new_group', 'id': 'action:new_group' },
+    { 'iconName': 'action:new_lead', 'id': 'action:new_lead' },
+    { 'iconName': 'action:new_note', 'id': 'action:new_note' },
+    { 'iconName': 'action:new_notebook', 'id': 'action:new_notebook' },
+    { 'iconName': 'action:new_opportunity', 'id': 'action:new_opportunity' },
+    { 'iconName': 'action:new_person_account', 'id': 'action:new_person_account' },
+    { 'iconName': 'action:new_task', 'id': 'action:new_task' },
+    { 'iconName': 'action:new', 'id': 'action:new' },
+    { 'iconName': 'action:password_unlock', 'id': 'action:password_unlock' },
+    { 'iconName': 'action:preview', 'id': 'action:preview' },
+    { 'iconName': 'action:priority', 'id': 'action:priority' },
+    { 'iconName': 'action:question_post_action', 'id': 'action:question_post_action' },
+    { 'iconName': 'action:quote', 'id': 'action:quote' },
+    { 'iconName': 'action:recall', 'id': 'action:recall' },
+    { 'iconName': 'action:record', 'id': 'action:record' },
+    { 'iconName': 'action:refresh', 'id': 'action:refresh' },
+    { 'iconName': 'action:reject', 'id': 'action:reject' },
+    { 'iconName': 'action:remove_relationship', 'id': 'action:remove_relationship' },
+    { 'iconName': 'action:remove', 'id': 'action:remove' },
+    { 'iconName': 'action:reset_password', 'id': 'action:reset_password' },
+    { 'iconName': 'action:script', 'id': 'action:script' },
+    { 'iconName': 'action:share_file', 'id': 'action:share_file' },
+    { 'iconName': 'action:share_link', 'id': 'action:share_link' },
+    { 'iconName': 'action:share_poll', 'id': 'action:share_poll' },
+    { 'iconName': 'action:share_post', 'id': 'action:share_post' },
+    { 'iconName': 'action:share_thanks', 'id': 'action:share_thanks' },
+    { 'iconName': 'action:share', 'id': 'action:share' },
+    { 'iconName': 'action:sort', 'id': 'action:sort' },
+    { 'iconName': 'action:submit_for_approval', 'id': 'action:submit_for_approval' },
+    { 'iconName': 'action:update_status', 'id': 'action:update_status' },
+    { 'iconName': 'action:update', 'id': 'action:update' },
+    { 'iconName': 'action:upload', 'id': 'action:upload' },
+    { 'iconName': 'action:user_activation', 'id': 'action:user_activation' },
+    { 'iconName': 'action:user', 'id': 'action:user' },
+    { 'iconName': 'action:view_relationship', 'id': 'action:view_relationship' },
+    { 'iconName': 'action:web_link', 'id': 'action:web_link' }
+];
+
+const CUSTOM_ICONS = [{ 'iconName': 'custom:custom1', 'id': 'custom:custom1' },
+    { 'iconName': 'custom:custom2', 'id': 'custom:custom2' },
+    { 'iconName': 'custom:custom3', 'id': 'custom:custom3' },
+    { 'iconName': 'custom:custom4', 'id': 'custom:custom4' },
+    { 'iconName': 'custom:custom5', 'id': 'custom:custom5' },
+    { 'iconName': 'custom:custom6', 'id': 'custom:custom6' },
+    { 'iconName': 'custom:custom7', 'id': 'custom:custom7' },
+    { 'iconName': 'custom:custom8', 'id': 'custom:custom8' },
+    { 'iconName': 'custom:custom9', 'id': 'custom:custom9' },
+    { 'iconName': 'custom:custom10', 'id': 'custom:custom10' },
+    { 'iconName': 'custom:custom11', 'id': 'custom:custom11' },
+    { 'iconName': 'custom:custom12', 'id': 'custom:custom12' },
+    { 'iconName': 'custom:custom13', 'id': 'custom:custom13' },
+    { 'iconName': 'custom:custom14', 'id': 'custom:custom14' },
+    { 'iconName': 'custom:custom15', 'id': 'custom:custom15' },
+    { 'iconName': 'custom:custom16', 'id': 'custom:custom16' },
+    { 'iconName': 'custom:custom17', 'id': 'custom:custom17' },
+    { 'iconName': 'custom:custom18', 'id': 'custom:custom18' },
+    { 'iconName': 'custom:custom19', 'id': 'custom:custom19' },
+    { 'iconName': 'custom:custom20', 'id': 'custom:custom20' },
+    { 'iconName': 'custom:custom21', 'id': 'custom:custom21' },
+    { 'iconName': 'custom:custom22', 'id': 'custom:custom22' },
+    { 'iconName': 'custom:custom23', 'id': 'custom:custom23' },
+    { 'iconName': 'custom:custom24', 'id': 'custom:custom24' },
+    { 'iconName': 'custom:custom25', 'id': 'custom:custom25' },
+    { 'iconName': 'custom:custom26', 'id': 'custom:custom26' },
+    { 'iconName': 'custom:custom27', 'id': 'custom:custom27' },
+    { 'iconName': 'custom:custom28', 'id': 'custom:custom28' },
+    { 'iconName': 'custom:custom29', 'id': 'custom:custom29' },
+    { 'iconName': 'custom:custom30', 'id': 'custom:custom30' },
+    { 'iconName': 'custom:custom31', 'id': 'custom:custom31' },
+    { 'iconName': 'custom:custom32', 'id': 'custom:custom32' },
+    { 'iconName': 'custom:custom33', 'id': 'custom:custom33' },
+    { 'iconName': 'custom:custom34', 'id': 'custom:custom34' },
+    { 'iconName': 'custom:custom35', 'id': 'custom:custom35' },
+    { 'iconName': 'custom:custom36', 'id': 'custom:custom36' },
+    { 'iconName': 'custom:custom37', 'id': 'custom:custom37' },
+    { 'iconName': 'custom:custom38', 'id': 'custom:custom38' },
+    { 'iconName': 'custom:custom39', 'id': 'custom:custom39' },
+    { 'iconName': 'custom:custom40', 'id': 'custom:custom40' },
+    { 'iconName': 'custom:custom41', 'id': 'custom:custom41' },
+    { 'iconName': 'custom:custom42', 'id': 'custom:custom42' },
+    { 'iconName': 'custom:custom43', 'id': 'custom:custom43' },
+    { 'iconName': 'custom:custom44', 'id': 'custom:custom44' },
+    { 'iconName': 'custom:custom45', 'id': 'custom:custom45' },
+    { 'iconName': 'custom:custom46', 'id': 'custom:custom46' },
+    { 'iconName': 'custom:custom47', 'id': 'custom:custom47' },
+    { 'iconName': 'custom:custom48', 'id': 'custom:custom48' },
+    { 'iconName': 'custom:custom49', 'id': 'custom:custom49' },
+    { 'iconName': 'custom:custom50', 'id': 'custom:custom50' },
+    { 'iconName': 'custom:custom51', 'id': 'custom:custom51' },
+    { 'iconName': 'custom:custom52', 'id': 'custom:custom52' },
+    { 'iconName': 'custom:custom53', 'id': 'custom:custom53' },
+    { 'iconName': 'custom:custom54', 'id': 'custom:custom54' },
+    { 'iconName': 'custom:custom55', 'id': 'custom:custom55' },
+    { 'iconName': 'custom:custom56', 'id': 'custom:custom56' },
+    { 'iconName': 'custom:custom57', 'id': 'custom:custom57' },
+    { 'iconName': 'custom:custom58', 'id': 'custom:custom58' },
+    { 'iconName': 'custom:custom59', 'id': 'custom:custom59' },
+    { 'iconName': 'custom:custom60', 'id': 'custom:custom60' },
+    { 'iconName': 'custom:custom61', 'id': 'custom:custom61' },
+    { 'iconName': 'custom:custom62', 'id': 'custom:custom62' },
+    { 'iconName': 'custom:custom63', 'id': 'custom:custom63' },
+    { 'iconName': 'custom:custom64', 'id': 'custom:custom64' },
+    { 'iconName': 'custom:custom65', 'id': 'custom:custom65' },
+    { 'iconName': 'custom:custom66', 'id': 'custom:custom66' },
+    { 'iconName': 'custom:custom67', 'id': 'custom:custom67' },
+    { 'iconName': 'custom:custom68', 'id': 'custom:custom68' },
+    { 'iconName': 'custom:custom69', 'id': 'custom:custom69' },
+    { 'iconName': 'custom:custom70', 'id': 'custom:custom70' },
+    { 'iconName': 'custom:custom71', 'id': 'custom:custom71' },
+    { 'iconName': 'custom:custom72', 'id': 'custom:custom72' },
+    { 'iconName': 'custom:custom73', 'id': 'custom:custom73' },
+    { 'iconName': 'custom:custom74', 'id': 'custom:custom74' },
+    { 'iconName': 'custom:custom75', 'id': 'custom:custom75' },
+    { 'iconName': 'custom:custom76', 'id': 'custom:custom76' },
+    { 'iconName': 'custom:custom77', 'id': 'custom:custom77' },
+    { 'iconName': 'custom:custom78', 'id': 'custom:custom78' },
+    { 'iconName': 'custom:custom79', 'id': 'custom:custom79' },
+    { 'iconName': 'custom:custom80', 'id': 'custom:custom80' },
+    { 'iconName': 'custom:custom81', 'id': 'custom:custom81' },
+    { 'iconName': 'custom:custom82', 'id': 'custom:custom82' },
+    { 'iconName': 'custom:custom83', 'id': 'custom:custom83' },
+    { 'iconName': 'custom:custom84', 'id': 'custom:custom84' },
+    { 'iconName': 'custom:custom85', 'id': 'custom:custom85' },
+    { 'iconName': 'custom:custom86', 'id': 'custom:custom86' },
+    { 'iconName': 'custom:custom87', 'id': 'custom:custom87' },
+    { 'iconName': 'custom:custom88', 'id': 'custom:custom88' },
+    { 'iconName': 'custom:custom89', 'id': 'custom:custom89' },
+    { 'iconName': 'custom:custom90', 'id': 'custom:custom90' },
+    { 'iconName': 'custom:custom91', 'id': 'custom:custom91' },
+    { 'iconName': 'custom:custom92', 'id': 'custom:custom92' },
+    { 'iconName': 'custom:custom93', 'id': 'custom:custom93' },
+    { 'iconName': 'custom:custom94', 'id': 'custom:custom94' },
+    { 'iconName': 'custom:custom95', 'id': 'custom:custom95' },
+    { 'iconName': 'custom:custom96', 'id': 'custom:custom96' },
+    { 'iconName': 'custom:custom97', 'id': 'custom:custom97' },
+    { 'iconName': 'custom:custom98', 'id': 'custom:custom98' },
+    { 'iconName': 'custom:custom99', 'id': 'custom:custom99' },
+    { 'iconName': 'custom:custom100', 'id': 'custom:custom100' },
+    { 'iconName': 'custom:custom101', 'id': 'custom:custom101' },
+    { 'iconName': 'custom:custom102', 'id': 'custom:custom102' },
+    { 'iconName': 'custom:custom103', 'id': 'custom:custom103' },
+    { 'iconName': 'custom:custom104', 'id': 'custom:custom104' },
+    { 'iconName': 'custom:custom105', 'id': 'custom:custom105' },
+    { 'iconName': 'custom:custom106', 'id': 'custom:custom106' },
+    { 'iconName': 'custom:custom107', 'id': 'custom:custom107' },
+    { 'iconName': 'custom:custom108', 'id': 'custom:custom108' },
+    { 'iconName': 'custom:custom109', 'id': 'custom:custom109' },
+    { 'iconName': 'custom:custom110', 'id': 'custom:custom110' },
+    { 'iconName': 'custom:custom111', 'id': 'custom:custom111' },
+    { 'iconName': 'custom:custom112', 'id': 'custom:custom112' },
+    { 'iconName': 'custom:custom113', 'id': 'custom:custom113' }
+]
+
+const STANDARD_ICONS = [
+    { 'iconName': 'standard:account', 'id': 'standard:account' },
+    { 'iconName': 'standard:action_list_component', 'id': 'standard:action_list_component' },
+    { 'iconName': 'standard:actions_and_buttons', 'id': 'standard:actions_and_buttons' },
+    { 'iconName': 'standard:activation_target', 'id': 'standard:activation_target' },
+    { 'iconName': 'standard:activations', 'id': 'standard:activations' },
+    { 'iconName': 'standard:address', 'id': 'standard:address' },
+    { 'iconName': 'standard:agent_home', 'id': 'standard:agent_home' },
+    { 'iconName': 'standard:agent_session', 'id': 'standard:agent_session' },
+    { 'iconName': 'standard:aggregation_policy', 'id': 'standard:aggregation_policy' },
+    { 'iconName': 'standard:all', 'id': 'standard:all' },
+    { 'iconName': 'standard:announcement', 'id': 'standard:announcement' },
+    { 'iconName': 'standard:answer_best', 'id': 'standard:answer_best' },
+    { 'iconName': 'standard:answer_private', 'id': 'standard:answer_private' },
+    { 'iconName': 'standard:answer_public', 'id': 'standard:answer_public' },
+    { 'iconName': 'standard:apex', 'id': 'standard:apex' },
+    { 'iconName': 'standard:apex_plugin', 'id': 'standard:apex_plugin' },
+    { 'iconName': 'standard:app', 'id': 'standard:app' },
+    { 'iconName': 'standard:approval', 'id': 'standard:approval' },
+    { 'iconName': 'standard:apps', 'id': 'standard:apps' },
+    { 'iconName': 'standard:apps_admin', 'id': 'standard:apps_admin' },
+    { 'iconName': 'standard:article', 'id': 'standard:article' },
+    { 'iconName': 'standard:asset_action', 'id': 'standard:asset_action' },
+    { 'iconName': 'standard:asset_action_source', 'id': 'standard:asset_action_source' },
+    { 'iconName': 'standard:asset_downtime_period', 'id': 'standard:asset_downtime_period' },
+    { 'iconName': 'standard:asset_object', 'id': 'standard:asset_object' },
+    { 'iconName': 'standard:asset_relationship', 'id': 'standard:asset_relationship' },
+    { 'iconName': 'standard:asset_state_period', 'id': 'standard:asset_state_period' },
+    { 'iconName': 'standard:asset_warranty', 'id': 'standard:asset_warranty' },
+    { 'iconName': 'standard:assigned_resource', 'id': 'standard:assigned_resource' },
+    { 'iconName': 'standard:assignment', 'id': 'standard:assignment' },
+    { 'iconName': 'standard:avatar', 'id': 'standard:avatar' },
+    { 'iconName': 'standard:avatar_loading', 'id': 'standard:avatar_loading' },
+    { 'iconName': 'standard:bot', 'id': 'standard:bot' },
+    { 'iconName': 'standard:bot_training', 'id': 'standard:bot_training' },
+    { 'iconName': 'standard:branch_merge', 'id': 'standard:branch_merge' },
+    { 'iconName': 'standard:brand', 'id': 'standard:brand' },
+    { 'iconName': 'standard:bundle_config', 'id': 'standard:bundle_config' },
+    { 'iconName': 'standard:bundle_policy', 'id': 'standard:bundle_policy' },
+    { 'iconName': 'standard:business_hours', 'id': 'standard:business_hours' },
+    { 'iconName': 'standard:buyer_account', 'id': 'standard:buyer_account' },
+    { 'iconName': 'standard:buyer_group', 'id': 'standard:buyer_group' },
+    { 'iconName': 'standard:calculated_insights', 'id': 'standard:calculated_insights' },
+    { 'iconName': 'standard:calibration', 'id': 'standard:calibration' },
+    { 'iconName': 'standard:call', 'id': 'standard:call' },
+    { 'iconName': 'standard:call_coaching', 'id': 'standard:call_coaching' },
+    { 'iconName': 'standard:call_history', 'id': 'standard:call_history' },
+    { 'iconName': 'standard:campaign', 'id': 'standard:campaign' },
+    { 'iconName': 'standard:campaign_members', 'id': 'standard:campaign_members' },
+    { 'iconName': 'standard:cancel_checkout', 'id': 'standard:cancel_checkout' },
+    { 'iconName': 'standard:canvas', 'id': 'standard:canvas' },
+    { 'iconName': 'standard:capacity_plan', 'id': 'standard:capacity_plan' },
+    { 'iconName': 'standard:care_request_reviewer', 'id': 'standard:care_request_reviewer' },
+    { 'iconName': 'standard:carousel', 'id': 'standard:carousel' },
+    { 'iconName': 'standard:case', 'id': 'standard:case' },
+    { 'iconName': 'standard:case_change_status', 'id': 'standard:case_change_status' },
+    { 'iconName': 'standard:case_comment', 'id': 'standard:case_comment' },
+    { 'iconName': 'standard:case_email', 'id': 'standard:case_email' },
+    { 'iconName': 'standard:case_log_a_call', 'id': 'standard:case_log_a_call' },
+    { 'iconName': 'standard:case_milestone', 'id': 'standard:case_milestone' },
+    { 'iconName': 'standard:case_transcript', 'id': 'standard:case_transcript' },
+    { 'iconName': 'standard:case_wrap_up', 'id': 'standard:case_wrap_up' },
+    { 'iconName': 'standard:catalog', 'id': 'standard:catalog' },
+    { 'iconName': 'standard:category', 'id': 'standard:category' },
+    { 'iconName': 'standard:channel_program_history', 'id': 'standard:channel_program_history' },
+    { 'iconName': 'standard:channel_program_levels', 'id': 'standard:channel_program_levels' },
+    { 'iconName': 'standard:channel_program_members', 'id': 'standard:channel_program_members' },
+    { 'iconName': 'standard:channel_programs', 'id': 'standard:channel_programs' },
+    { 'iconName': 'standard:chart', 'id': 'standard:chart' },
+    { 'iconName': 'standard:checkout', 'id': 'standard:checkout' },
+    { 'iconName': 'standard:choice', 'id': 'standard:choice' },
+    { 'iconName': 'standard:client', 'id': 'standard:client' },
+    { 'iconName': 'standard:cms', 'id': 'standard:cms' },
+    { 'iconName': 'standard:coaching', 'id': 'standard:coaching' },
+    { 'iconName': 'standard:code_playground', 'id': 'standard:code_playground' },
+    { 'iconName': 'standard:collection', 'id': 'standard:collection' },
+    { 'iconName': 'standard:collection_variable', 'id': 'standard:collection_variable' },
+    { 'iconName': 'standard:connected_apps', 'id': 'standard:connected_apps' },
+    { 'iconName': 'standard:constant', 'id': 'standard:constant' },
+    { 'iconName': 'standard:contact', 'id': 'standard:contact' },
+    { 'iconName': 'standard:contact_list', 'id': 'standard:contact_list' },
+    { 'iconName': 'standard:contact_request', 'id': 'standard:contact_request' },
+    { 'iconName': 'standard:contract', 'id': 'standard:contract' },
+    { 'iconName': 'standard:contract_line_item', 'id': 'standard:contract_line_item' },
+    { 'iconName': 'standard:currency', 'id': 'standard:currency' },
+    { 'iconName': 'standard:currency_input', 'id': 'standard:currency_input' },
+    { 'iconName': 'standard:custom', 'id': 'standard:custom' },
+    { 'iconName': 'standard:custom_component_task', 'id': 'standard:custom_component_task' },
+    { 'iconName': 'standard:custom_notification', 'id': 'standard:custom_notification' },
+    { 'iconName': 'standard:customer_360', 'id': 'standard:customer_360' },
+    { 'iconName': 'standard:customer_lifecycle_analytics', 'id': 'standard:customer_lifecycle_analytics' },
+    { 'iconName': 'standard:customer_portal_users', 'id': 'standard:customer_portal_users' },
+    { 'iconName': 'standard:customers', 'id': 'standard:customers' },
+    { 'iconName': 'standard:dashboard', 'id': 'standard:dashboard' },
+    { 'iconName': 'standard:dashboard_ea', 'id': 'standard:dashboard_ea' },
+    { 'iconName': 'standard:data_integration_hub', 'id': 'standard:data_integration_hub' },
+    { 'iconName': 'standard:data_mapping', 'id': 'standard:data_mapping' },
+    { 'iconName': 'standard:data_model', 'id': 'standard:data_model' },
+    { 'iconName': 'standard:data_streams', 'id': 'standard:data_streams' },
+    { 'iconName': 'standard:datadotcom', 'id': 'standard:datadotcom' },
+    { 'iconName': 'standard:dataset', 'id': 'standard:dataset' },
+    { 'iconName': 'standard:date_input', 'id': 'standard:date_input' },
+    { 'iconName': 'standard:date_time', 'id': 'standard:date_time' },
+    { 'iconName': 'standard:decision', 'id': 'standard:decision' },
+    { 'iconName': 'standard:default', 'id': 'standard:default' },
+    { 'iconName': 'standard:delegated_account', 'id': 'standard:delegated_account' },
+    { 'iconName': 'standard:device', 'id': 'standard:device' },
+    { 'iconName': 'standard:display_rich_text', 'id': 'standard:display_rich_text' },
+    { 'iconName': 'standard:display_text', 'id': 'standard:display_text' },
+    { 'iconName': 'standard:document', 'id': 'standard:document' },
+    { 'iconName': 'standard:document_reference', 'id': 'standard:document_reference' },
+    { 'iconName': 'standard:drafts', 'id': 'standard:drafts' },
+    { 'iconName': 'standard:duration_downscale', 'id': 'standard:duration_downscale' },
+    { 'iconName': 'standard:dynamic_record_choice', 'id': 'standard:dynamic_record_choice' },
+    { 'iconName': 'standard:education', 'id': 'standard:education' },
+    { 'iconName': 'standard:einstein_replies', 'id': 'standard:einstein_replies' },
+    { 'iconName': 'standard:email', 'id': 'standard:email' },
+    { 'iconName': 'standard:email_chatter', 'id': 'standard:email_chatter' },
+    { 'iconName': 'standard:employee', 'id': 'standard:employee' },
+    { 'iconName': 'standard:employee_asset', 'id': 'standard:employee_asset' },
+    { 'iconName': 'standard:employee_contact', 'id': 'standard:employee_contact' },
+    { 'iconName': 'standard:employee_job', 'id': 'standard:employee_job' },
+    { 'iconName': 'standard:employee_job_position', 'id': 'standard:employee_job_position' },
+    { 'iconName': 'standard:employee_organization', 'id': 'standard:employee_organization' },
+    { 'iconName': 'standard:empty', 'id': 'standard:empty' },
+    { 'iconName': 'standard:endorsement', 'id': 'standard:endorsement' },
+    { 'iconName': 'standard:entitlement', 'id': 'standard:entitlement' },
+    { 'iconName': 'standard:entitlement_policy', 'id': 'standard:entitlement_policy' },
+    { 'iconName': 'standard:entitlement_process', 'id': 'standard:entitlement_process' },
+    { 'iconName': 'standard:entitlement_template', 'id': 'standard:entitlement_template' },
+    { 'iconName': 'standard:entity', 'id': 'standard:entity' },
+    { 'iconName': 'standard:entity_milestone', 'id': 'standard:entity_milestone' },
+    { 'iconName': 'standard:environment_hub', 'id': 'standard:environment_hub' },
+    { 'iconName': 'standard:event', 'id': 'standard:event' },
+    { 'iconName': 'standard:events', 'id': 'standard:events' },
+    { 'iconName': 'standard:expense', 'id': 'standard:expense' },
+    { 'iconName': 'standard:expense_report', 'id': 'standard:expense_report' },
+    { 'iconName': 'standard:expense_report_entry', 'id': 'standard:expense_report_entry' },
+    { 'iconName': 'standard:feed', 'id': 'standard:feed' },
+    { 'iconName': 'standard:feedback', 'id': 'standard:feedback' },
+    { 'iconName': 'standard:file', 'id': 'standard:file' },
+    { 'iconName': 'standard:filter', 'id': 'standard:filter' },
+    { 'iconName': 'standard:filter_criteria', 'id': 'standard:filter_criteria' },
+    { 'iconName': 'standard:filter_criteria_rule', 'id': 'standard:filter_criteria_rule' },
+    { 'iconName': 'standard:first_non_empty', 'id': 'standard:first_non_empty' },
+    { 'iconName': 'standard:flow', 'id': 'standard:flow' },
+    { 'iconName': 'standard:folder', 'id': 'standard:folder' },
+    { 'iconName': 'standard:forecasts', 'id': 'standard:forecasts' },
+    { 'iconName': 'standard:form', 'id': 'standard:form' },
+    { 'iconName': 'standard:formula', 'id': 'standard:formula' },
+    { 'iconName': 'standard:fulfillment_order', 'id': 'standard:fulfillment_order' },
+    { 'iconName': 'standard:generic_loading', 'id': 'standard:generic_loading' },
+    { 'iconName': 'standard:global_constant', 'id': 'standard:global_constant' },
+    { 'iconName': 'standard:goals', 'id': 'standard:goals' },
+    { 'iconName': 'standard:group_loading', 'id': 'standard:group_loading' },
+    { 'iconName': 'standard:groups', 'id': 'standard:groups' },
+    { 'iconName': 'standard:guidance_center', 'id': 'standard:guidance_center' },
+    { 'iconName': 'standard:hierarchy', 'id': 'standard:hierarchy' },
+    { 'iconName': 'standard:high_velocity_sales', 'id': 'standard:high_velocity_sales' },
+    { 'iconName': 'standard:holiday_operating_hours', 'id': 'standard:holiday_operating_hours' },
+    { 'iconName': 'standard:home', 'id': 'standard:home' },
+    { 'iconName': 'standard:household', 'id': 'standard:household' },
+    { 'iconName': 'standard:immunization', 'id': 'standard:immunization' },
+    { 'iconName': 'standard:individual', 'id': 'standard:individual' },
+    { 'iconName': 'standard:insights', 'id': 'standard:insights' },
+    { 'iconName': 'standard:instore_locations', 'id': 'standard:instore_locations' },
+    { 'iconName': 'standard:investment_account', 'id': 'standard:investment_account' },
+    { 'iconName': 'standard:invocable_action', 'id': 'standard:invocable_action' },
+    { 'iconName': 'standard:iot_context', 'id': 'standard:iot_context' },
+    { 'iconName': 'standard:iot_orchestrations', 'id': 'standard:iot_orchestrations' },
+    { 'iconName': 'standard:javascript_button', 'id': 'standard:javascript_button' },
+    { 'iconName': 'standard:job_family', 'id': 'standard:job_family' },
+    { 'iconName': 'standard:job_position', 'id': 'standard:job_position' },
+    { 'iconName': 'standard:job_profile', 'id': 'standard:job_profile' },
+    { 'iconName': 'standard:kanban', 'id': 'standard:kanban' },
+    { 'iconName': 'standard:key_dates', 'id': 'standard:key_dates' },
+    { 'iconName': 'standard:knowledge', 'id': 'standard:knowledge' },
+    { 'iconName': 'standard:lead', 'id': 'standard:lead' },
+    { 'iconName': 'standard:lead_insights', 'id': 'standard:lead_insights' },
+    { 'iconName': 'standard:lead_list', 'id': 'standard:lead_list' },
+    { 'iconName': 'standard:letterhead', 'id': 'standard:letterhead' },
+    { 'iconName': 'standard:lightning_component', 'id': 'standard:lightning_component' },
+    { 'iconName': 'standard:lightning_usage', 'id': 'standard:lightning_usage' },
+    { 'iconName': 'standard:link', 'id': 'standard:link' },
+    { 'iconName': 'standard:list_email', 'id': 'standard:list_email' },
+    { 'iconName': 'standard:live_chat', 'id': 'standard:live_chat' },
+    { 'iconName': 'standard:live_chat_visitor', 'id': 'standard:live_chat_visitor' },
+    { 'iconName': 'standard:location', 'id': 'standard:location' },
+    { 'iconName': 'standard:location_permit', 'id': 'standard:location_permit' },
+    { 'iconName': 'standard:log_a_call', 'id': 'standard:log_a_call' },
+    { 'iconName': 'standard:logging', 'id': 'standard:logging' },
+    { 'iconName': 'standard:loop', 'id': 'standard:loop' },
+    { 'iconName': 'standard:macros', 'id': 'standard:macros' },
+    { 'iconName': 'standard:maintenance_asset', 'id': 'standard:maintenance_asset' },
+    { 'iconName': 'standard:maintenance_plan', 'id': 'standard:maintenance_plan' },
+    { 'iconName': 'standard:maintenance_work_rule', 'id': 'standard:maintenance_work_rule' },
+    { 'iconName': 'standard:marketing_actions', 'id': 'standard:marketing_actions' },
+    { 'iconName': 'standard:medication_ingredient', 'id': 'standard:medication_ingredient' },
+    { 'iconName': 'standard:merge', 'id': 'standard:merge' },
+    { 'iconName': 'standard:messaging_conversation', 'id': 'standard:messaging_conversation' },
+    { 'iconName': 'standard:messaging_session', 'id': 'standard:messaging_session' },
+    { 'iconName': 'standard:messaging_user', 'id': 'standard:messaging_user' },
+    { 'iconName': 'standard:metrics', 'id': 'standard:metrics' },
+    { 'iconName': 'standard:multi_picklist', 'id': 'standard:multi_picklist' },
+    { 'iconName': 'standard:multi_select_checkbox', 'id': 'standard:multi_select_checkbox' },
+    { 'iconName': 'standard:news', 'id': 'standard:news' },
+    { 'iconName': 'standard:note', 'id': 'standard:note' },
+    { 'iconName': 'standard:number_input', 'id': 'standard:number_input' },
+    { 'iconName': 'standard:observation_component', 'id': 'standard:observation_component' },
+    { 'iconName': 'standard:omni_supervisor', 'id': 'standard:omni_supervisor' },
+    { 'iconName': 'standard:operating_hours', 'id': 'standard:operating_hours' },
+    { 'iconName': 'standard:opportunity', 'id': 'standard:opportunity' },
+    { 'iconName': 'standard:opportunity_contact_role', 'id': 'standard:opportunity_contact_role' },
+    { 'iconName': 'standard:opportunity_splits', 'id': 'standard:opportunity_splits' },
+    { 'iconName': 'standard:orchestrator', 'id': 'standard:orchestrator' },
+    { 'iconName': 'standard:order_item', 'id': 'standard:order_item' },
+    { 'iconName': 'standard:orders', 'id': 'standard:orders' },
+    { 'iconName': 'standard:outcome', 'id': 'standard:outcome' },
+    { 'iconName': 'standard:output', 'id': 'standard:output' },
+    { 'iconName': 'standard:partner_fund_allocation', 'id': 'standard:partner_fund_allocation' },
+    { 'iconName': 'standard:partner_fund_claim', 'id': 'standard:partner_fund_claim' },
+    { 'iconName': 'standard:partner_fund_request', 'id': 'standard:partner_fund_request' },
+    { 'iconName': 'standard:partner_marketing_budget', 'id': 'standard:partner_marketing_budget' },
+    { 'iconName': 'standard:partners', 'id': 'standard:partners' },
+    { 'iconName': 'standard:password', 'id': 'standard:password' },
+    { 'iconName': 'standard:past_chat', 'id': 'standard:past_chat' },
+    { 'iconName': 'standard:payment_gateway', 'id': 'standard:payment_gateway' },
+    { 'iconName': 'standard:people', 'id': 'standard:people' },
+    { 'iconName': 'standard:performance', 'id': 'standard:performance' },
+    { 'iconName': 'standard:person_account', 'id': 'standard:person_account' },
+    { 'iconName': 'standard:photo', 'id': 'standard:photo' },
+    { 'iconName': 'standard:picklist_choice', 'id': 'standard:picklist_choice' },
+    { 'iconName': 'standard:picklist_type', 'id': 'standard:picklist_type' },
+    { 'iconName': 'standard:planogram', 'id': 'standard:planogram' },
+    { 'iconName': 'standard:poll', 'id': 'standard:poll' },
+    { 'iconName': 'standard:portal', 'id': 'standard:portal' },
+    { 'iconName': 'standard:portal_roles', 'id': 'standard:portal_roles' },
+    { 'iconName': 'standard:portal_roles_and_subordinates', 'id': 'standard:portal_roles_and_subordinates' },
+    { 'iconName': 'standard:post', 'id': 'standard:post' },
+    { 'iconName': 'standard:practitioner_role', 'id': 'standard:practitioner_role' },
+    { 'iconName': 'standard:price_book_entries', 'id': 'standard:price_book_entries' },
+    { 'iconName': 'standard:price_books', 'id': 'standard:price_books' },
+    { 'iconName': 'standard:pricebook', 'id': 'standard:pricebook' },
+    { 'iconName': 'standard:pricing_workspace', 'id': 'standard:pricing_workspace' },
+    { 'iconName': 'standard:procedure', 'id': 'standard:procedure' },
+    { 'iconName': 'standard:procedure_detail', 'id': 'standard:procedure_detail' },
+    { 'iconName': 'standard:process', 'id': 'standard:process' },
+    { 'iconName': 'standard:process_exception', 'id': 'standard:process_exception' },
+    { 'iconName': 'standard:product', 'id': 'standard:product' },
+    { 'iconName': 'standard:product_consumed', 'id': 'standard:product_consumed' },
+    { 'iconName': 'standard:product_item', 'id': 'standard:product_item' },
+    { 'iconName': 'standard:product_item_transaction', 'id': 'standard:product_item_transaction' },
+    { 'iconName': 'standard:product_quantity_rules', 'id': 'standard:product_quantity_rules' },
+    { 'iconName': 'standard:product_request', 'id': 'standard:product_request' },
+    { 'iconName': 'standard:product_request_line_item', 'id': 'standard:product_request_line_item' },
+    { 'iconName': 'standard:product_required', 'id': 'standard:product_required' },
+    { 'iconName': 'standard:product_service_campaign', 'id': 'standard:product_service_campaign' },
+    { 'iconName': 'standard:product_service_campaign_item', 'id': 'standard:product_service_campaign_item' },
+    { 'iconName': 'standard:product_transfer', 'id': 'standard:product_transfer' },
+    { 'iconName': 'standard:product_warranty_term', 'id': 'standard:product_warranty_term' },
+    { 'iconName': 'standard:product_workspace', 'id': 'standard:product_workspace' },
+    { 'iconName': 'standard:products', 'id': 'standard:products' },
+    { 'iconName': 'standard:promotions', 'id': 'standard:promotions' },
+    { 'iconName': 'standard:propagation_policy', 'id': 'standard:propagation_policy' },
+    { 'iconName': 'standard:proposition', 'id': 'standard:proposition' },
+    { 'iconName': 'standard:question_best', 'id': 'standard:question_best' },
+    { 'iconName': 'standard:question_feed', 'id': 'standard:question_feed' },
+    { 'iconName': 'standard:queue', 'id': 'standard:queue' },
+    { 'iconName': 'standard:quick_text', 'id': 'standard:quick_text' },
+    { 'iconName': 'standard:quip', 'id': 'standard:quip' },
+    { 'iconName': 'standard:quip_sheet', 'id': 'standard:quip_sheet' },
+    { 'iconName': 'standard:quotes', 'id': 'standard:quotes' },
+    { 'iconName': 'standard:radio_button', 'id': 'standard:radio_button' },
+    { 'iconName': 'standard:read_receipts', 'id': 'standard:read_receipts' },
+    { 'iconName': 'standard:recent', 'id': 'standard:recent' },
+    { 'iconName': 'standard:recipe', 'id': 'standard:recipe' },
+    { 'iconName': 'standard:record', 'id': 'standard:record' },
+    { 'iconName': 'standard:record_create', 'id': 'standard:record_create' },
+    { 'iconName': 'standard:record_delete', 'id': 'standard:record_delete' },
+    { 'iconName': 'standard:record_lookup', 'id': 'standard:record_lookup' },
+    { 'iconName': 'standard:record_signature_task', 'id': 'standard:record_signature_task' },
+    { 'iconName': 'standard:record_update', 'id': 'standard:record_update' },
+    { 'iconName': 'standard:recycle_bin', 'id': 'standard:recycle_bin' },
+    { 'iconName': 'standard:related_list', 'id': 'standard:related_list' },
+    { 'iconName': 'standard:relationship', 'id': 'standard:relationship' },
+    { 'iconName': 'standard:reply_text', 'id': 'standard:reply_text' },
+    { 'iconName': 'standard:report', 'id': 'standard:report' },
+    { 'iconName': 'standard:resource_absence', 'id': 'standard:resource_absence' },
+    { 'iconName': 'standard:resource_capacity', 'id': 'standard:resource_capacity' },
+    { 'iconName': 'standard:resource_preference', 'id': 'standard:resource_preference' },
+    { 'iconName': 'standard:resource_skill', 'id': 'standard:resource_skill' },
+    { 'iconName': 'standard:restriction_policy', 'id': 'standard:restriction_policy' },
+    { 'iconName': 'standard:return_order', 'id': 'standard:return_order' },
+    { 'iconName': 'standard:return_order_line_item', 'id': 'standard:return_order_line_item' },
+    { 'iconName': 'standard:reward', 'id': 'standard:reward' },
+    { 'iconName': 'standard:rtc_presence', 'id': 'standard:rtc_presence' },
+    { 'iconName': 'standard:sales_cadence', 'id': 'standard:sales_cadence' },
+    { 'iconName': 'standard:sales_cadence_target', 'id': 'standard:sales_cadence_target' },
+    { 'iconName': 'standard:sales_channel', 'id': 'standard:sales_channel' },
+    { 'iconName': 'standard:sales_path', 'id': 'standard:sales_path' },
+    { 'iconName': 'standard:sales_value', 'id': 'standard:sales_value' },
+    { 'iconName': 'standard:salesforce_cms', 'id': 'standard:salesforce_cms' },
+    { 'iconName': 'standard:scan_card', 'id': 'standard:scan_card' },
+    { 'iconName': 'standard:schedule_objective', 'id': 'standard:schedule_objective' },
+    { 'iconName': 'standard:scheduling_constraint', 'id': 'standard:scheduling_constraint' },
+    { 'iconName': 'standard:scheduling_policy', 'id': 'standard:scheduling_policy' },
+    { 'iconName': 'standard:screen', 'id': 'standard:screen' },
+    { 'iconName': 'standard:search', 'id': 'standard:search' },
+    { 'iconName': 'standard:section', 'id': 'standard:section' },
+    { 'iconName': 'standard:segments', 'id': 'standard:segments' },
+    { 'iconName': 'standard:selling_model', 'id': 'standard:selling_model' },
+    { 'iconName': 'standard:serialized_product', 'id': 'standard:serialized_product' },
+    { 'iconName': 'standard:serialized_product_transaction', 'id': 'standard:serialized_product_transaction' },
+    { 'iconName': 'standard:service_appointment', 'id': 'standard:service_appointment' },
+    { 'iconName': 'standard:service_appointment_capacity_usage', 'id': 'standard:service_appointment_capacity_usage' },
+    { 'iconName': 'standard:service_contract', 'id': 'standard:service_contract' },
+    { 'iconName': 'standard:service_crew', 'id': 'standard:service_crew' },
+    { 'iconName': 'standard:service_crew_member', 'id': 'standard:service_crew_member' },
+    { 'iconName': 'standard:service_report', 'id': 'standard:service_report' },
+    { 'iconName': 'standard:service_request', 'id': 'standard:service_request' },
+    { 'iconName': 'standard:service_request_detail', 'id': 'standard:service_request_detail' },
+    { 'iconName': 'standard:service_resource', 'id': 'standard:service_resource' },
+    { 'iconName': 'standard:service_territory', 'id': 'standard:service_territory' },
+    { 'iconName': 'standard:service_territory_location', 'id': 'standard:service_territory_location' },
+    { 'iconName': 'standard:service_territory_member', 'id': 'standard:service_territory_member' },
+    { 'iconName': 'standard:service_territory_policy', 'id': 'standard:service_territory_policy' },
+    { 'iconName': 'standard:settings', 'id': 'standard:settings' },
+    { 'iconName': 'standard:shift', 'id': 'standard:shift' },
+    { 'iconName': 'standard:shift_pattern', 'id': 'standard:shift_pattern' },
+    { 'iconName': 'standard:shift_pattern_entry', 'id': 'standard:shift_pattern_entry' },
+    { 'iconName': 'standard:shift_preference', 'id': 'standard:shift_preference' },
+    { 'iconName': 'standard:shift_scheduling_operation', 'id': 'standard:shift_scheduling_operation' },
+    { 'iconName': 'standard:shift_template', 'id': 'standard:shift_template' },
+    { 'iconName': 'standard:shift_type', 'id': 'standard:shift_type' },
+    { 'iconName': 'standard:shipment', 'id': 'standard:shipment' },
+    { 'iconName': 'standard:skill', 'id': 'standard:skill' },
+    { 'iconName': 'standard:skill_entity', 'id': 'standard:skill_entity' },
+    { 'iconName': 'standard:skill_requirement', 'id': 'standard:skill_requirement' },
+    { 'iconName': 'standard:slider', 'id': 'standard:slider' },
+    { 'iconName': 'standard:sms', 'id': 'standard:sms' },
+    { 'iconName': 'standard:snippet', 'id': 'standard:snippet' },
+    { 'iconName': 'standard:snippets', 'id': 'standard:snippets' },
+    { 'iconName': 'standard:sobject', 'id': 'standard:sobject' },
+    { 'iconName': 'standard:sobject_collection', 'id': 'standard:sobject_collection' },
+    { 'iconName': 'standard:social', 'id': 'standard:social' },
+    { 'iconName': 'standard:solution', 'id': 'standard:solution' },
+    { 'iconName': 'standard:sort', 'id': 'standard:sort' },
+    { 'iconName': 'standard:sort_policy', 'id': 'standard:sort_policy' },
+    { 'iconName': 'standard:sossession', 'id': 'standard:sossession' },
+    { 'iconName': 'standard:stage', 'id': 'standard:stage' },
+    { 'iconName': 'standard:stage_collection', 'id': 'standard:stage_collection' },
+    { 'iconName': 'standard:steps', 'id': 'standard:steps' },
+    { 'iconName': 'standard:store', 'id': 'standard:store' },
+    { 'iconName': 'standard:store_group', 'id': 'standard:store_group' },
+    { 'iconName': 'standard:story', 'id': 'standard:story' },
+    { 'iconName': 'standard:strategy', 'id': 'standard:strategy' },
+    { 'iconName': 'standard:survey', 'id': 'standard:survey' },
+    { 'iconName': 'standard:swarm_request', 'id': 'standard:swarm_request' },
+    { 'iconName': 'standard:swarm_session', 'id': 'standard:swarm_session' },
+    { 'iconName': 'standard:system_and_global_variable', 'id': 'standard:system_and_global_variable' },
+    { 'iconName': 'standard:task', 'id': 'standard:task' },
+    { 'iconName': 'standard:task2', 'id': 'standard:task2' },
+    { 'iconName': 'standard:team_member', 'id': 'standard:team_member' },
+    { 'iconName': 'standard:template', 'id': 'standard:template' },
+    { 'iconName': 'standard:text', 'id': 'standard:text' },
+    { 'iconName': 'standard:text_template', 'id': 'standard:text_template' },
+    { 'iconName': 'standard:textarea', 'id': 'standard:textarea' },
+    { 'iconName': 'standard:textbox', 'id': 'standard:textbox' },
+    { 'iconName': 'standard:thanks', 'id': 'standard:thanks' },
+    { 'iconName': 'standard:thanks_loading', 'id': 'standard:thanks_loading' },
+    { 'iconName': 'standard:timesheet', 'id': 'standard:timesheet' },
+    { 'iconName': 'standard:timesheet_entry', 'id': 'standard:timesheet_entry' },
+    { 'iconName': 'standard:timeslot', 'id': 'standard:timeslot' },
+    { 'iconName': 'standard:today', 'id': 'standard:today' },
+    { 'iconName': 'standard:toggle', 'id': 'standard:toggle' },
+    { 'iconName': 'standard:topic', 'id': 'standard:topic' },
+    { 'iconName': 'standard:topic2', 'id': 'standard:topic2' },
+    { 'iconName': 'standard:trailhead', 'id': 'standard:trailhead' },
+    { 'iconName': 'standard:trailhead_alt', 'id': 'standard:trailhead_alt' },
+    { 'iconName': 'standard:travel_mode', 'id': 'standard:travel_mode' },
+    { 'iconName': 'standard:unmatched', 'id': 'standard:unmatched' },
+    { 'iconName': 'standard:user', 'id': 'standard:user' },
+    { 'iconName': 'standard:user_role', 'id': 'standard:user_role' },
+    { 'iconName': 'standard:variable', 'id': 'standard:variable' },
+    { 'iconName': 'standard:variation_attribute_setup', 'id': 'standard:variation_attribute_setup' },
+    { 'iconName': 'standard:variation_products', 'id': 'standard:variation_products' },
+    { 'iconName': 'standard:video', 'id': 'standard:video' },
+    { 'iconName': 'standard:visit_templates', 'id': 'standard:visit_templates' },
+    { 'iconName': 'standard:visits', 'id': 'standard:visits' },
+    { 'iconName': 'standard:visualforce_page', 'id': 'standard:visualforce_page' },
+    { 'iconName': 'standard:voice_call', 'id': 'standard:voice_call' },
+    { 'iconName': 'standard:waits', 'id': 'standard:waits' },
+    { 'iconName': 'standard:warranty_term', 'id': 'standard:warranty_term' },
+    { 'iconName': 'standard:webcart', 'id': 'standard:webcart' },
+    { 'iconName': 'standard:work_capacity_limit', 'id': 'standard:work_capacity_limit' },
+    { 'iconName': 'standard:work_capacity_usage', 'id': 'standard:work_capacity_usage' },
+    { 'iconName': 'standard:work_contract', 'id': 'standard:work_contract' },
+    { 'iconName': 'standard:work_forecast', 'id': 'standard:work_forecast' },
+    { 'iconName': 'standard:work_order', 'id': 'standard:work_order' },
+    { 'iconName': 'standard:work_order_item', 'id': 'standard:work_order_item' },
+    { 'iconName': 'standard:work_plan', 'id': 'standard:work_plan' },
+    { 'iconName': 'standard:work_plan_rule', 'id': 'standard:work_plan_rule' },
+    { 'iconName': 'standard:work_plan_template', 'id': 'standard:work_plan_template' },
+    { 'iconName': 'standard:work_plan_template_entry', 'id': 'standard:work_plan_template_entry' },
+    { 'iconName': 'standard:work_queue', 'id': 'standard:work_queue' },
+    { 'iconName': 'standard:work_step', 'id': 'standard:work_step' },
+    { 'iconName': 'standard:work_step_template', 'id': 'standard:work_step_template' },
+    { 'iconName': 'standard:work_type', 'id': 'standard:work_type' },
+    { 'iconName': 'standard:work_type_group', 'id': 'standard:work_type_group' }    
+]
+
+const UTILITY_ICONS = [
+    { 'iconName': 'utility:activity', 'id': 'utility:activity' },
+    { 'iconName': 'utility:ad_set', 'id': 'utility:ad_set' },
+    { 'iconName': 'utility:add', 'id': 'utility:add' },
+    { 'iconName': 'utility:adduser', 'id': 'utility:adduser' },
+    { 'iconName': 'utility:adjust_value', 'id': 'utility:adjust_value' },
+    { 'iconName': 'utility:advanced_function', 'id': 'utility:advanced_function' },
+    { 'iconName': 'utility:advertising', 'id': 'utility:advertising' },
+    { 'iconName': 'utility:agent_home', 'id': 'utility:agent_home' },
+    { 'iconName': 'utility:agent_session', 'id': 'utility:agent_session' },
+    { 'iconName': 'utility:aggregation_policy', 'id': 'utility:aggregation_policy' },
+    { 'iconName': 'utility:alert', 'id': 'utility:alert' },
+    { 'iconName': 'utility:all', 'id': 'utility:all' },
+    { 'iconName': 'utility:anchor', 'id': 'utility:anchor' },
+    { 'iconName': 'utility:animal_and_nature', 'id': 'utility:animal_and_nature' },
+    { 'iconName': 'utility:announcement', 'id': 'utility:announcement' },
+    { 'iconName': 'utility:answer', 'id': 'utility:answer' },
+    { 'iconName': 'utility:answered_twice', 'id': 'utility:answered_twice' },
+    { 'iconName': 'utility:anywhere_alert', 'id': 'utility:anywhere_alert' },
+    { 'iconName': 'utility:anywhere_chat', 'id': 'utility:anywhere_chat' },
+    { 'iconName': 'utility:apex', 'id': 'utility:apex' },
+    { 'iconName': 'utility:apex_plugin', 'id': 'utility:apex_plugin' },
+    { 'iconName': 'utility:approval', 'id': 'utility:approval' },
+    { 'iconName': 'utility:apps', 'id': 'utility:apps' },
+    { 'iconName': 'utility:archive', 'id': 'utility:archive' },
+    { 'iconName': 'utility:arrow_bottom', 'id': 'utility:arrow_bottom' },
+    { 'iconName': 'utility:arrow_left', 'id': 'utility:arrow_left' },
+    { 'iconName': 'utility:arrow_right', 'id': 'utility:arrow_right' },
+    { 'iconName': 'utility:arrow_top', 'id': 'utility:arrow_top' },
+    { 'iconName': 'utility:arrowdown', 'id': 'utility:arrowdown' },
+    { 'iconName': 'utility:arrowup', 'id': 'utility:arrowup' },
+    { 'iconName': 'utility:asset_warranty', 'id': 'utility:asset_warranty' },
+    { 'iconName': 'utility:assignment', 'id': 'utility:assignment' },
+    { 'iconName': 'utility:attach', 'id': 'utility:attach' },
+    { 'iconName': 'utility:automate', 'id': 'utility:automate' },
+    { 'iconName': 'utility:away', 'id': 'utility:away' },
+    { 'iconName': 'utility:back', 'id': 'utility:back' },
+    { 'iconName': 'utility:ban', 'id': 'utility:ban' },
+    { 'iconName': 'utility:block_visitor', 'id': 'utility:block_visitor' },
+    { 'iconName': 'utility:bold', 'id': 'utility:bold' },
+    { 'iconName': 'utility:bookmark', 'id': 'utility:bookmark' },
+    { 'iconName': 'utility:bottom_align', 'id': 'utility:bottom_align' },
+    { 'iconName': 'utility:breadcrumbs', 'id': 'utility:breadcrumbs' },
+    { 'iconName': 'utility:broadcast', 'id': 'utility:broadcast' },
+    { 'iconName': 'utility:brush', 'id': 'utility:brush' },
+    { 'iconName': 'utility:bucket', 'id': 'utility:bucket' },
+    { 'iconName': 'utility:bug', 'id': 'utility:bug' },
+    { 'iconName': 'utility:builder', 'id': 'utility:builder' },
+    { 'iconName': 'utility:bundle_config', 'id': 'utility:bundle_config' },
+    { 'iconName': 'utility:bundle_policy', 'id': 'utility:bundle_policy' },
+    { 'iconName': 'utility:button_choice', 'id': 'utility:button_choice' },
+    { 'iconName': 'utility:calculated_insights', 'id': 'utility:calculated_insights' },
+    { 'iconName': 'utility:call', 'id': 'utility:call' },
+    { 'iconName': 'utility:campaign', 'id': 'utility:campaign' },
+    { 'iconName': 'utility:cancel_file_request', 'id': 'utility:cancel_file_request' },
+    { 'iconName': 'utility:cancel_transfer', 'id': 'utility:cancel_transfer' },
+    { 'iconName': 'utility:capacity_plan', 'id': 'utility:capacity_plan' },
+    { 'iconName': 'utility:capslock', 'id': 'utility:capslock' },
+    { 'iconName': 'utility:cart', 'id': 'utility:cart' },
+    { 'iconName': 'utility:case', 'id': 'utility:case' },
+    { 'iconName': 'utility:cases', 'id': 'utility:cases' },
+    { 'iconName': 'utility:center_align', 'id': 'utility:center_align' },
+    { 'iconName': 'utility:center_align_text', 'id': 'utility:center_align_text' },
+    { 'iconName': 'utility:change_owner', 'id': 'utility:change_owner' },
+    { 'iconName': 'utility:change_record_type', 'id': 'utility:change_record_type' },
+    { 'iconName': 'utility:chart', 'id': 'utility:chart' },
+    { 'iconName': 'utility:chat', 'id': 'utility:chat' },
+    { 'iconName': 'utility:check', 'id': 'utility:check' },
+    { 'iconName': 'utility:checkin', 'id': 'utility:checkin' },
+    { 'iconName': 'utility:checkout', 'id': 'utility:checkout' },
+    { 'iconName': 'utility:chevrondown', 'id': 'utility:chevrondown' },
+    { 'iconName': 'utility:chevronleft', 'id': 'utility:chevronleft' },
+    { 'iconName': 'utility:chevronright', 'id': 'utility:chevronright' },
+    { 'iconName': 'utility:chevronup', 'id': 'utility:chevronup' },
+    { 'iconName': 'utility:choice', 'id': 'utility:choice' },
+    { 'iconName': 'utility:classic_interface', 'id': 'utility:classic_interface' },
+    { 'iconName': 'utility:clear', 'id': 'utility:clear' },
+    { 'iconName': 'utility:clock', 'id': 'utility:clock' },
+    { 'iconName': 'utility:close', 'id': 'utility:close' },
+    { 'iconName': 'utility:collapse_all', 'id': 'utility:collapse_all' },
+    { 'iconName': 'utility:collection', 'id': 'utility:collection' },
+    { 'iconName': 'utility:collection_variable', 'id': 'utility:collection_variable' },
+    { 'iconName': 'utility:color_swatch', 'id': 'utility:color_swatch' },
+    { 'iconName': 'utility:comments', 'id': 'utility:comments' },
+    { 'iconName': 'utility:company', 'id': 'utility:company' },
+    { 'iconName': 'utility:component_customization', 'id': 'utility:component_customization' },
+    { 'iconName': 'utility:connected_apps', 'id': 'utility:connected_apps' },
+    { 'iconName': 'utility:constant', 'id': 'utility:constant' },
+    { 'iconName': 'utility:contact_request', 'id': 'utility:contact_request' },
+    { 'iconName': 'utility:contract', 'id': 'utility:contract' },
+    { 'iconName': 'utility:contract_alt', 'id': 'utility:contract_alt' },
+    { 'iconName': 'utility:copy', 'id': 'utility:copy' },
+    { 'iconName': 'utility:copy_to_clipboard', 'id': 'utility:copy_to_clipboard' },
+    { 'iconName': 'utility:crossfilter', 'id': 'utility:crossfilter' },
+    { 'iconName': 'utility:currency', 'id': 'utility:currency' },
+    { 'iconName': 'utility:currency_input', 'id': 'utility:currency_input' },
+    { 'iconName': 'utility:custom_apps', 'id': 'utility:custom_apps' },
+    { 'iconName': 'utility:cut', 'id': 'utility:cut' },
+    { 'iconName': 'utility:dash', 'id': 'utility:dash' },
+    { 'iconName': 'utility:data_mapping', 'id': 'utility:data_mapping' },
+    { 'iconName': 'utility:database', 'id': 'utility:database' },
+    { 'iconName': 'utility:datadotcom', 'id': 'utility:datadotcom' },
+    { 'iconName': 'utility:date_input', 'id': 'utility:date_input' },
+    { 'iconName': 'utility:date_time', 'id': 'utility:date_time' },
+    { 'iconName': 'utility:dayview', 'id': 'utility:dayview' },
+    { 'iconName': 'utility:delete', 'id': 'utility:delete' },
+    { 'iconName': 'utility:deprecate', 'id': 'utility:deprecate' },
+    { 'iconName': 'utility:description', 'id': 'utility:description' },
+    { 'iconName': 'utility:desktop', 'id': 'utility:desktop' },
+    { 'iconName': 'utility:desktop_and_phone', 'id': 'utility:desktop_and_phone' },
+    { 'iconName': 'utility:desktop_console', 'id': 'utility:desktop_console' },
+    { 'iconName': 'utility:dialing', 'id': 'utility:dialing' },
+    { 'iconName': 'utility:diamond', 'id': 'utility:diamond' },
+    { 'iconName': 'utility:dislike', 'id': 'utility:dislike' },
+    { 'iconName': 'utility:display_rich_text', 'id': 'utility:display_rich_text' },
+    { 'iconName': 'utility:display_text', 'id': 'utility:display_text' },
+    { 'iconName': 'utility:dock_panel', 'id': 'utility:dock_panel' },
+    { 'iconName': 'utility:down', 'id': 'utility:down' },
+    { 'iconName': 'utility:download', 'id': 'utility:download' },
+    { 'iconName': 'utility:drag', 'id': 'utility:drag' },
+    { 'iconName': 'utility:drag_and_drop', 'id': 'utility:drag_and_drop' },
+    { 'iconName': 'utility:duration_downscale', 'id': 'utility:duration_downscale' },
+    { 'iconName': 'utility:dynamic_record_choice', 'id': 'utility:dynamic_record_choice' },
+    { 'iconName': 'utility:edit', 'id': 'utility:edit' },
+    { 'iconName': 'utility:edit_form', 'id': 'utility:edit_form' },
+    { 'iconName': 'utility:education', 'id': 'utility:education' },
+    { 'iconName': 'utility:einstein', 'id': 'utility:einstein' },
+    { 'iconName': 'utility:email', 'id': 'utility:email' },
+    { 'iconName': 'utility:email_open', 'id': 'utility:email_open' },
+    { 'iconName': 'utility:emoji', 'id': 'utility:emoji' },
+    { 'iconName': 'utility:end_call', 'id': 'utility:end_call' },
+    { 'iconName': 'utility:end_chat', 'id': 'utility:end_chat' },
+    { 'iconName': 'utility:end_messaging_session', 'id': 'utility:end_messaging_session' },
+    { 'iconName': 'utility:engage', 'id': 'utility:engage' },
+    { 'iconName': 'utility:enter', 'id': 'utility:enter' },
+    { 'iconName': 'utility:erect_window', 'id': 'utility:erect_window' },
+    { 'iconName': 'utility:error', 'id': 'utility:error' },
+    { 'iconName': 'utility:event', 'id': 'utility:event' },
+    { 'iconName': 'utility:event_ext', 'id': 'utility:event_ext' },
+    { 'iconName': 'utility:events', 'id': 'utility:events' },
+    { 'iconName': 'utility:expand', 'id': 'utility:expand' },
+    { 'iconName': 'utility:expand_all', 'id': 'utility:expand_all' },
+    { 'iconName': 'utility:expand_alt', 'id': 'utility:expand_alt' },
+    { 'iconName': 'utility:fallback', 'id': 'utility:fallback' },
+    { 'iconName': 'utility:favorite', 'id': 'utility:favorite' },
+    { 'iconName': 'utility:feed', 'id': 'utility:feed' },
+    { 'iconName': 'utility:file', 'id': 'utility:file' },
+    { 'iconName': 'utility:filter', 'id': 'utility:filter' },
+    { 'iconName': 'utility:filter_criteria', 'id': 'utility:filter_criteria' },
+    { 'iconName': 'utility:filter_criteria_rule', 'id': 'utility:filter_criteria_rule' },
+    { 'iconName': 'utility:filterList', 'id': 'utility:filterList' },
+    { 'iconName': 'utility:flow', 'id': 'utility:flow' },
+    { 'iconName': 'utility:flow_alt', 'id': 'utility:flow_alt' },
+    { 'iconName': 'utility:food_and_drink', 'id': 'utility:food_and_drink' },
+    { 'iconName': 'utility:form', 'id': 'utility:form' },
+    { 'iconName': 'utility:formula', 'id': 'utility:formula' },
+    { 'iconName': 'utility:forward', 'id': 'utility:forward' },
+    { 'iconName': 'utility:forward_up', 'id': 'utility:forward_up' },
+    { 'iconName': 'utility:freeze_column', 'id': 'utility:freeze_column' },
+    { 'iconName': 'utility:frozen', 'id': 'utility:frozen' },
+    { 'iconName': 'utility:fulfillment_order', 'id': 'utility:fulfillment_order' },
+    { 'iconName': 'utility:full_width_view', 'id': 'utility:full_width_view' },
+    { 'iconName': 'utility:global_constant', 'id': 'utility:global_constant' },
+    { 'iconName': 'utility:graph', 'id': 'utility:graph' },
+    { 'iconName': 'utility:groups', 'id': 'utility:groups' },
+    { 'iconName': 'utility:help', 'id': 'utility:help' },
+    { 'iconName': 'utility:help_center', 'id': 'utility:help_center' },
+    { 'iconName': 'utility:help_doc_ext', 'id': 'utility:help_doc_ext' },
+    { 'iconName': 'utility:hide', 'id': 'utility:hide' },
+    { 'iconName': 'utility:hide_mobile', 'id': 'utility:hide_mobile' },
+    { 'iconName': 'utility:hierarchy', 'id': 'utility:hierarchy' },
+    { 'iconName': 'utility:high_velocity_sales', 'id': 'utility:high_velocity_sales' },
+    { 'iconName': 'utility:holiday_operating_hours', 'id': 'utility:holiday_operating_hours' },
+    { 'iconName': 'utility:home', 'id': 'utility:home' },
+    { 'iconName': 'utility:identity', 'id': 'utility:identity' },
+    { 'iconName': 'utility:image', 'id': 'utility:image' },
+    { 'iconName': 'utility:in_app_assistant', 'id': 'utility:in_app_assistant' },
+    { 'iconName': 'utility:inbox', 'id': 'utility:inbox' },
+    { 'iconName': 'utility:incoming_call', 'id': 'utility:incoming_call' },
+    { 'iconName': 'utility:info', 'id': 'utility:info' },
+    { 'iconName': 'utility:info_alt', 'id': 'utility:info_alt' },
+    { 'iconName': 'utility:insert_tag_field', 'id': 'utility:insert_tag_field' },
+    { 'iconName': 'utility:insert_template', 'id': 'utility:insert_template' },
+    { 'iconName': 'utility:inspector_panel', 'id': 'utility:inspector_panel' },
+    { 'iconName': 'utility:internal_share', 'id': 'utility:internal_share' },
+    { 'iconName': 'utility:italic', 'id': 'utility:italic' },
+    { 'iconName': 'utility:jump_to_bottom', 'id': 'utility:jump_to_bottom' },
+    { 'iconName': 'utility:jump_to_left', 'id': 'utility:jump_to_left' },
+    { 'iconName': 'utility:jump_to_right', 'id': 'utility:jump_to_right' },
+    { 'iconName': 'utility:jump_to_top', 'id': 'utility:jump_to_top' },
+    { 'iconName': 'utility:justify_text', 'id': 'utility:justify_text' },
+    { 'iconName': 'utility:kanban', 'id': 'utility:kanban' },
+    { 'iconName': 'utility:key', 'id': 'utility:key' },
+    { 'iconName': 'utility:key_dates', 'id': 'utility:key_dates' },
+    { 'iconName': 'utility:keyboard_dismiss', 'id': 'utility:keyboard_dismiss' },
+    { 'iconName': 'utility:keypad', 'id': 'utility:keypad' },
+    { 'iconName': 'utility:knowledge_base', 'id': 'utility:knowledge_base' },
+    { 'iconName': 'utility:layers', 'id': 'utility:layers' },
+    { 'iconName': 'utility:layout', 'id': 'utility:layout' },
+    { 'iconName': 'utility:leave_conference', 'id': 'utility:leave_conference' },
+    { 'iconName': 'utility:left', 'id': 'utility:left' },
+    { 'iconName': 'utility:left_align', 'id': 'utility:left_align' },
+    { 'iconName': 'utility:left_align_text', 'id': 'utility:left_align_text' },
+    { 'iconName': 'utility:level_down', 'id': 'utility:level_down' },
+    { 'iconName': 'utility:level_up', 'id': 'utility:level_up' },
+    { 'iconName': 'utility:light_bulb', 'id': 'utility:light_bulb' },
+    { 'iconName': 'utility:lightning_extension', 'id': 'utility:lightning_extension' },
+    { 'iconName': 'utility:lightning_inspector', 'id': 'utility:lightning_inspector' },
+    { 'iconName': 'utility:like', 'id': 'utility:like' },
+    { 'iconName': 'utility:link', 'id': 'utility:link' },
+    { 'iconName': 'utility:linked', 'id': 'utility:linked' },
+    { 'iconName': 'utility:list', 'id': 'utility:list' },
+    { 'iconName': 'utility:listen', 'id': 'utility:listen' },
+    { 'iconName': 'utility:live_message', 'id': 'utility:live_message' },
+    { 'iconName': 'utility:location', 'id': 'utility:location' },
+    { 'iconName': 'utility:location_permit', 'id': 'utility:location_permit' },
+    { 'iconName': 'utility:lock', 'id': 'utility:lock' },
+    { 'iconName': 'utility:locker_service_api_viewer', 'id': 'utility:locker_service_api_viewer' },
+    { 'iconName': 'utility:locker_service_console', 'id': 'utility:locker_service_console' },
+    { 'iconName': 'utility:log_a_call', 'id': 'utility:log_a_call' },
+    { 'iconName': 'utility:logout', 'id': 'utility:logout' },
+    { 'iconName': 'utility:loop', 'id': 'utility:loop' },
+    { 'iconName': 'utility:lower_flag', 'id': 'utility:lower_flag' },
+    { 'iconName': 'utility:macros', 'id': 'utility:macros' },
+    { 'iconName': 'utility:magicwand', 'id': 'utility:magicwand' },
+    { 'iconName': 'utility:mark_all_as_read', 'id': 'utility:mark_all_as_read' },
+    { 'iconName': 'utility:matrix', 'id': 'utility:matrix' },
+    { 'iconName': 'utility:meet_content_source', 'id': 'utility:meet_content_source' },
+    { 'iconName': 'utility:meet_focus_content', 'id': 'utility:meet_focus_content' },
+    { 'iconName': 'utility:meet_focus_equal', 'id': 'utility:meet_focus_equal' },
+    { 'iconName': 'utility:meet_focus_presenter', 'id': 'utility:meet_focus_presenter' },
+    { 'iconName': 'utility:meet_present_panel', 'id': 'utility:meet_present_panel' },
+    { 'iconName': 'utility:merge', 'id': 'utility:merge' },
+    { 'iconName': 'utility:merge_field', 'id': 'utility:merge_field' },
+    { 'iconName': 'utility:metrics', 'id': 'utility:metrics' },
+    { 'iconName': 'utility:middle_align', 'id': 'utility:middle_align' },
+    { 'iconName': 'utility:minimize_window', 'id': 'utility:minimize_window' },
+    { 'iconName': 'utility:missed_call', 'id': 'utility:missed_call' },
+    { 'iconName': 'utility:money', 'id': 'utility:money' },
+    { 'iconName': 'utility:moneybag', 'id': 'utility:moneybag' },
+    { 'iconName': 'utility:monthlyview', 'id': 'utility:monthlyview' },
+    { 'iconName': 'utility:move', 'id': 'utility:move' },
+    { 'iconName': 'utility:multi_picklist', 'id': 'utility:multi_picklist' },
+    { 'iconName': 'utility:multi_select_checkbox', 'id': 'utility:multi_select_checkbox' },
+    { 'iconName': 'utility:muted', 'id': 'utility:muted' },
+    { 'iconName': 'utility:new', 'id': 'utility:new' },
+    { 'iconName': 'utility:new_direct_message', 'id': 'utility:new_direct_message' },
+    { 'iconName': 'utility:new_window', 'id': 'utility:new_window' },
+    { 'iconName': 'utility:news', 'id': 'utility:news' },
+    { 'iconName': 'utility:note', 'id': 'utility:note' },
+    { 'iconName': 'utility:notebook', 'id': 'utility:notebook' },
+    { 'iconName': 'utility:notification', 'id': 'utility:notification' },
+    { 'iconName': 'utility:number_input', 'id': 'utility:number_input' },
+    { 'iconName': 'utility:office365', 'id': 'utility:office365' },
+    { 'iconName': 'utility:offline', 'id': 'utility:offline' },
+    { 'iconName': 'utility:offline_briefcase', 'id': 'utility:offline_briefcase' },
+    { 'iconName': 'utility:offline_cached', 'id': 'utility:offline_cached' },
+    { 'iconName': 'utility:omni_channel', 'id': 'utility:omni_channel' },
+    { 'iconName': 'utility:open', 'id': 'utility:open' },
+    { 'iconName': 'utility:open_folder', 'id': 'utility:open_folder' },
+    { 'iconName': 'utility:opened_folder', 'id': 'utility:opened_folder' },
+    { 'iconName': 'utility:orchestrator', 'id': 'utility:orchestrator' },
+    { 'iconName': 'utility:org_chart', 'id': 'utility:org_chart' },
+    { 'iconName': 'utility:outbound_call', 'id': 'utility:outbound_call' },
+    { 'iconName': 'utility:outcome', 'id': 'utility:outcome' },
+    { 'iconName': 'utility:overflow', 'id': 'utility:overflow' },
+    { 'iconName': 'utility:package', 'id': 'utility:package' },
+    { 'iconName': 'utility:package_org', 'id': 'utility:package_org' },
+    { 'iconName': 'utility:package_org_beta', 'id': 'utility:package_org_beta' },
+    { 'iconName': 'utility:page', 'id': 'utility:page' },
+    { 'iconName': 'utility:palette', 'id': 'utility:palette' },
+    { 'iconName': 'utility:password', 'id': 'utility:password' },
+    { 'iconName': 'utility:paste', 'id': 'utility:paste' },
+    { 'iconName': 'utility:pause', 'id': 'utility:pause' },
+    { 'iconName': 'utility:pause_alt', 'id': 'utility:pause_alt' },
+    { 'iconName': 'utility:payment_gateway', 'id': 'utility:payment_gateway' },
+    { 'iconName': 'utility:pdf_ext', 'id': 'utility:pdf_ext' },
+    { 'iconName': 'utility:people', 'id': 'utility:people' },
+    { 'iconName': 'utility:percent', 'id': 'utility:percent' },
+    { 'iconName': 'utility:phone_landscape', 'id': 'utility:phone_landscape' },
+    { 'iconName': 'utility:phone_portrait', 'id': 'utility:phone_portrait' },
+    { 'iconName': 'utility:photo', 'id': 'utility:photo' },
+    { 'iconName': 'utility:picklist', 'id': 'utility:picklist' },
+    { 'iconName': 'utility:picklist_choice', 'id': 'utility:picklist_choice' },
+    { 'iconName': 'utility:picklist_type', 'id': 'utility:picklist_type' },
+    { 'iconName': 'utility:pin', 'id': 'utility:pin' },
+    { 'iconName': 'utility:pinned', 'id': 'utility:pinned' },
+    { 'iconName': 'utility:planning_poker', 'id': 'utility:planning_poker' },
+    { 'iconName': 'utility:play', 'id': 'utility:play' },
+    { 'iconName': 'utility:podcast_webinar', 'id': 'utility:podcast_webinar' },
+    { 'iconName': 'utility:pop_in', 'id': 'utility:pop_in' },
+    { 'iconName': 'utility:power', 'id': 'utility:power' },
+    { 'iconName': 'utility:preview', 'id': 'utility:preview' },
+    { 'iconName': 'utility:price_book_entries', 'id': 'utility:price_book_entries' },
+    { 'iconName': 'utility:price_books', 'id': 'utility:price_books' },
+    { 'iconName': 'utility:pricing_workspace', 'id': 'utility:pricing_workspace' },
+    { 'iconName': 'utility:print', 'id': 'utility:print' },
+    { 'iconName': 'utility:priority', 'id': 'utility:priority' },
+    { 'iconName': 'utility:privately_shared', 'id': 'utility:privately_shared' },
+    { 'iconName': 'utility:process', 'id': 'utility:process' },
+    { 'iconName': 'utility:product_quantity_rules', 'id': 'utility:product_quantity_rules' },
+    { 'iconName': 'utility:product_service_campaign', 'id': 'utility:product_service_campaign' },
+    { 'iconName': 'utility:product_service_campaign_item', 'id': 'utility:product_service_campaign_item' },
+    { 'iconName': 'utility:product_warranty_term', 'id': 'utility:product_warranty_term' },
+    { 'iconName': 'utility:product_workspace', 'id': 'utility:product_workspace' },
+    { 'iconName': 'utility:products', 'id': 'utility:products' },
+    { 'iconName': 'utility:profile', 'id': 'utility:profile' },
+    { 'iconName': 'utility:promotions', 'id': 'utility:promotions' },
+    { 'iconName': 'utility:prompt', 'id': 'utility:prompt' },
+    { 'iconName': 'utility:prompt_edit', 'id': 'utility:prompt_edit' },
+    { 'iconName': 'utility:propagation_policy', 'id': 'utility:propagation_policy' },
+    { 'iconName': 'utility:push', 'id': 'utility:push' },
+    { 'iconName': 'utility:puzzle', 'id': 'utility:puzzle' },
+    { 'iconName': 'utility:question', 'id': 'utility:question' },
+    { 'iconName': 'utility:question_mark', 'id': 'utility:question_mark' },
+    { 'iconName': 'utility:questions_and_answers', 'id': 'utility:questions_and_answers' },
+    { 'iconName': 'utility:quick_text', 'id': 'utility:quick_text' },
+    { 'iconName': 'utility:quip', 'id': 'utility:quip' },
+    { 'iconName': 'utility:quotation_marks', 'id': 'utility:quotation_marks' },
+    { 'iconName': 'utility:quote', 'id': 'utility:quote' },
+    { 'iconName': 'utility:radio_button', 'id': 'utility:radio_button' },
+    { 'iconName': 'utility:rating', 'id': 'utility:rating' },
+    { 'iconName': 'utility:reassign', 'id': 'utility:reassign' },
+    { 'iconName': 'utility:recipe', 'id': 'utility:recipe' },
+    { 'iconName': 'utility:record', 'id': 'utility:record' },
+    { 'iconName': 'utility:record_create', 'id': 'utility:record_create' },
+    { 'iconName': 'utility:record_delete', 'id': 'utility:record_delete' },
+    { 'iconName': 'utility:record_lookup', 'id': 'utility:record_lookup' },
+    { 'iconName': 'utility:record_update', 'id': 'utility:record_update' },
+    { 'iconName': 'utility:recurring_exception', 'id': 'utility:recurring_exception' },
+    { 'iconName': 'utility:recycle_bin_empty', 'id': 'utility:recycle_bin_empty' },
+    { 'iconName': 'utility:recycle_bin_full', 'id': 'utility:recycle_bin_full' },
+    { 'iconName': 'utility:redo', 'id': 'utility:redo' },
+    { 'iconName': 'utility:refresh', 'id': 'utility:refresh' },
+    { 'iconName': 'utility:relate', 'id': 'utility:relate' },
+    { 'iconName': 'utility:reminder', 'id': 'utility:reminder' },
+    { 'iconName': 'utility:remove_formatting', 'id': 'utility:remove_formatting' },
+    { 'iconName': 'utility:remove_link', 'id': 'utility:remove_link' },
+    { 'iconName': 'utility:replace', 'id': 'utility:replace' },
+    { 'iconName': 'utility:reply', 'id': 'utility:reply' },
+    { 'iconName': 'utility:reply_all', 'id': 'utility:reply_all' },
+    { 'iconName': 'utility:report_issue', 'id': 'utility:report_issue' },
+    { 'iconName': 'utility:reset_password', 'id': 'utility:reset_password' },
+    { 'iconName': 'utility:resource_absence', 'id': 'utility:resource_absence' },
+    { 'iconName': 'utility:resource_capacity', 'id': 'utility:resource_capacity' },
+    { 'iconName': 'utility:resource_territory', 'id': 'utility:resource_territory' },
+    { 'iconName': 'utility:restriction_policy', 'id': 'utility:restriction_policy' },
+    { 'iconName': 'utility:retail_execution', 'id': 'utility:retail_execution' },
+    { 'iconName': 'utility:retweet', 'id': 'utility:retweet' },
+    { 'iconName': 'utility:ribbon', 'id': 'utility:ribbon' },
+    { 'iconName': 'utility:richtextbulletedlist', 'id': 'utility:richtextbulletedlist' },
+    { 'iconName': 'utility:richtextindent', 'id': 'utility:richtextindent' },
+    { 'iconName': 'utility:richtextnumberedlist', 'id': 'utility:richtextnumberedlist' },
+    { 'iconName': 'utility:richtextoutdent', 'id': 'utility:richtextoutdent' },
+    { 'iconName': 'utility:right', 'id': 'utility:right' },
+    { 'iconName': 'utility:right_align', 'id': 'utility:right_align' },
+    { 'iconName': 'utility:right_align_text', 'id': 'utility:right_align_text' },
+    { 'iconName': 'utility:rotate', 'id': 'utility:rotate' },
+    { 'iconName': 'utility:routing_offline', 'id': 'utility:routing_offline' },
+    { 'iconName': 'utility:rows', 'id': 'utility:rows' },
+    { 'iconName': 'utility:rules', 'id': 'utility:rules' },
+    { 'iconName': 'utility:salesforce_page', 'id': 'utility:salesforce_page' },
+    { 'iconName': 'utility:salesforce1', 'id': 'utility:salesforce1' },
+    { 'iconName': 'utility:save', 'id': 'utility:save' },
+    { 'iconName': 'utility:screen', 'id': 'utility:screen' },
+    { 'iconName': 'utility:search', 'id': 'utility:search' },
+    { 'iconName': 'utility:section', 'id': 'utility:section' },
+    { 'iconName': 'utility:send', 'id': 'utility:send' },
+    { 'iconName': 'utility:sentiment_negative', 'id': 'utility:sentiment_negative' },
+    { 'iconName': 'utility:sentiment_neutral', 'id': 'utility:sentiment_neutral' },
+    { 'iconName': 'utility:serialized_product', 'id': 'utility:serialized_product' },
+    { 'iconName': 'utility:serialized_product_transaction', 'id': 'utility:serialized_product_transaction' },
+    { 'iconName': 'utility:service_territory_policy', 'id': 'utility:service_territory_policy' },
+    { 'iconName': 'utility:settings', 'id': 'utility:settings' },
+    { 'iconName': 'utility:setup', 'id': 'utility:setup' },
+    { 'iconName': 'utility:setup_assistant_guide', 'id': 'utility:setup_assistant_guide' },
+    { 'iconName': 'utility:setup_modal', 'id': 'utility:setup_modal' },
+    { 'iconName': 'utility:share', 'id': 'utility:share' },
+    { 'iconName': 'utility:share_file', 'id': 'utility:share_file' },
+    { 'iconName': 'utility:share_mobile', 'id': 'utility:share_mobile' },
+    { 'iconName': 'utility:share_post', 'id': 'utility:share_post' },
+    { 'iconName': 'utility:shield', 'id': 'utility:shield' },
+    { 'iconName': 'utility:shift_pattern', 'id': 'utility:shift_pattern' },
+    { 'iconName': 'utility:shift_pattern_entry', 'id': 'utility:shift_pattern_entry' },
+    { 'iconName': 'utility:shift_scheduling_operation', 'id': 'utility:shift_scheduling_operation' },
+    { 'iconName': 'utility:shift_ui', 'id': 'utility:shift_ui' },
+    { 'iconName': 'utility:shopping_bag', 'id': 'utility:shopping_bag' },
+    { 'iconName': 'utility:shortcuts', 'id': 'utility:shortcuts' },
+    { 'iconName': 'utility:side_list', 'id': 'utility:side_list' },
+    { 'iconName': 'utility:signpost', 'id': 'utility:signpost' },
+    { 'iconName': 'utility:skip', 'id': 'utility:skip' },
+    { 'iconName': 'utility:skip_back', 'id': 'utility:skip_back' },
+    { 'iconName': 'utility:skip_forward', 'id': 'utility:skip_forward' },
+    { 'iconName': 'utility:slider', 'id': 'utility:slider' },
+    { 'iconName': 'utility:smiley_and_people', 'id': 'utility:smiley_and_people' },
+    { 'iconName': 'utility:sms', 'id': 'utility:sms' },
+    { 'iconName': 'utility:snippet', 'id': 'utility:snippet' },
+    { 'iconName': 'utility:sobject', 'id': 'utility:sobject' },
+    { 'iconName': 'utility:sobject_collection', 'id': 'utility:sobject_collection' },
+    { 'iconName': 'utility:socialshare', 'id': 'utility:socialshare' },
+    { 'iconName': 'utility:sort', 'id': 'utility:sort' },
+    { 'iconName': 'utility:sort_policy', 'id': 'utility:sort_policy' },
+    { 'iconName': 'utility:spinner', 'id': 'utility:spinner' },
+    { 'iconName': 'utility:stage', 'id': 'utility:stage' },
+    { 'iconName': 'utility:stage_collection', 'id': 'utility:stage_collection' },
+    { 'iconName': 'utility:standard_objects', 'id': 'utility:standard_objects' },
+    { 'iconName': 'utility:steps', 'id': 'utility:steps' },
+    { 'iconName': 'utility:stop', 'id': 'utility:stop' },
+    { 'iconName': 'utility:store', 'id': 'utility:store' },
+    { 'iconName': 'utility:strategy', 'id': 'utility:strategy' },
+    { 'iconName': 'utility:strikethrough', 'id': 'utility:strikethrough' },
+    { 'iconName': 'utility:success', 'id': 'utility:success' },
+    { 'iconName': 'utility:summary', 'id': 'utility:summary' },
+    { 'iconName': 'utility:summarydetail', 'id': 'utility:summarydetail' },
+    { 'iconName': 'utility:survey', 'id': 'utility:survey' },
+    { 'iconName': 'utility:swarm_request', 'id': 'utility:swarm_request' },
+    { 'iconName': 'utility:swarm_session', 'id': 'utility:swarm_session' },
+    { 'iconName': 'utility:switch', 'id': 'utility:switch' },
+    { 'iconName': 'utility:symbols', 'id': 'utility:symbols' },
+    { 'iconName': 'utility:sync', 'id': 'utility:sync' },
+    { 'iconName': 'utility:system_and_global_variable', 'id': 'utility:system_and_global_variable' },
+    { 'iconName': 'utility:table', 'id': 'utility:table' },
+    { 'iconName': 'utility:table_settings', 'id': 'utility:table_settings' },
+    { 'iconName': 'utility:tablet_landscape', 'id': 'utility:tablet_landscape' },
+    { 'iconName': 'utility:tablet_portrait', 'id': 'utility:tablet_portrait' },
+    { 'iconName': 'utility:tabset', 'id': 'utility:tabset' },
+    { 'iconName': 'utility:talent_development', 'id': 'utility:talent_development' },
+    { 'iconName': 'utility:target', 'id': 'utility:target' },
+    { 'iconName': 'utility:target_mode', 'id': 'utility:target_mode' },
+    { 'iconName': 'utility:task', 'id': 'utility:task' },
+    { 'iconName': 'utility:text', 'id': 'utility:text' },
+    { 'iconName': 'utility:text_background_color', 'id': 'utility:text_background_color' },
+    { 'iconName': 'utility:text_color', 'id': 'utility:text_color' },
+    { 'iconName': 'utility:text_template', 'id': 'utility:text_template' },
+    { 'iconName': 'utility:textarea', 'id': 'utility:textarea' },
+    { 'iconName': 'utility:textbox', 'id': 'utility:textbox' },
+    { 'iconName': 'utility:threedots', 'id': 'utility:threedots' },
+    { 'iconName': 'utility:threedots_vertical', 'id': 'utility:threedots_vertical' },
+    { 'iconName': 'utility:thunder', 'id': 'utility:thunder' },
+    { 'iconName': 'utility:tile_card_list', 'id': 'utility:tile_card_list' },
+    { 'iconName': 'utility:toggle', 'id': 'utility:toggle' },
+    { 'iconName': 'utility:toggle_panel_bottom', 'id': 'utility:toggle_panel_bottom' },
+    { 'iconName': 'utility:toggle_panel_left', 'id': 'utility:toggle_panel_left' },
+    { 'iconName': 'utility:toggle_panel_right', 'id': 'utility:toggle_panel_right' },
+    { 'iconName': 'utility:toggle_panel_top', 'id': 'utility:toggle_panel_top' },
+    { 'iconName': 'utility:top_align', 'id': 'utility:top_align' },
+    { 'iconName': 'utility:topic', 'id': 'utility:topic' },
+    { 'iconName': 'utility:topic2', 'id': 'utility:topic2' },
+    { 'iconName': 'utility:touch_action', 'id': 'utility:touch_action' },
+    { 'iconName': 'utility:tracker', 'id': 'utility:tracker' },
+    { 'iconName': 'utility:trail', 'id': 'utility:trail' },
+    { 'iconName': 'utility:trailblazer_ext', 'id': 'utility:trailblazer_ext' },
+    { 'iconName': 'utility:trailhead', 'id': 'utility:trailhead' },
+    { 'iconName': 'utility:trailhead_alt', 'id': 'utility:trailhead_alt' },
+    { 'iconName': 'utility:trailhead_ext', 'id': 'utility:trailhead_ext' },
+    { 'iconName': 'utility:transparent', 'id': 'utility:transparent' },
+    { 'iconName': 'utility:travel_and_places', 'id': 'utility:travel_and_places' },
+    { 'iconName': 'utility:trending', 'id': 'utility:trending' },
+    { 'iconName': 'utility:turn_off_notifications', 'id': 'utility:turn_off_notifications' },
+    { 'iconName': 'utility:type', 'id': 'utility:type' },
+    { 'iconName': 'utility:type_tool', 'id': 'utility:type_tool' },
+    { 'iconName': 'utility:undelete', 'id': 'utility:undelete' },
+    { 'iconName': 'utility:undeprecate', 'id': 'utility:undeprecate' },
+    { 'iconName': 'utility:underline', 'id': 'utility:underline' },
+    { 'iconName': 'utility:undo', 'id': 'utility:undo' },
+    { 'iconName': 'utility:unlinked', 'id': 'utility:unlinked' },
+    { 'iconName': 'utility:unlock', 'id': 'utility:unlock' },
+    { 'iconName': 'utility:unmuted', 'id': 'utility:unmuted' },
+    { 'iconName': 'utility:up', 'id': 'utility:up' },
+    { 'iconName': 'utility:upload', 'id': 'utility:upload' },
+    { 'iconName': 'utility:user', 'id': 'utility:user' },
+    { 'iconName': 'utility:user_role', 'id': 'utility:user_role' },
+    { 'iconName': 'utility:variable', 'id': 'utility:variable' },
+    { 'iconName': 'utility:variation_attribute_setup', 'id': 'utility:variation_attribute_setup' },
+    { 'iconName': 'utility:variation_products', 'id': 'utility:variation_products' },
+    { 'iconName': 'utility:video', 'id': 'utility:video' },
+    { 'iconName': 'utility:voicemail_drop', 'id': 'utility:voicemail_drop' },
+    { 'iconName': 'utility:volume_high', 'id': 'utility:volume_high' },
+    { 'iconName': 'utility:volume_low', 'id': 'utility:volume_low' },
+    { 'iconName': 'utility:volume_off', 'id': 'utility:volume_off' },
+    { 'iconName': 'utility:waits', 'id': 'utility:waits' },
+    { 'iconName': 'utility:warning', 'id': 'utility:warning' },
+    { 'iconName': 'utility:warranty_term', 'id': 'utility:warranty_term' },
+    { 'iconName': 'utility:watchlist', 'id': 'utility:watchlist' },
+    { 'iconName': 'utility:weeklyview', 'id': 'utility:weeklyview' },
+    { 'iconName': 'utility:wellness', 'id': 'utility:wellness' },
+    { 'iconName': 'utility:wifi', 'id': 'utility:wifi' },
+    { 'iconName': 'utility:work_forecast', 'id': 'utility:work_forecast' },
+    { 'iconName': 'utility:work_order_type', 'id': 'utility:work_order_type' },
+    { 'iconName': 'utility:world', 'id': 'utility:world' },
+    { 'iconName': 'utility:yubi_key', 'id': 'utility:yubi_key' },
+    { 'iconName': 'utility:zoomin', 'id': 'utility:zoomin' },
+    { 'iconName': 'utility:zoomout', 'id': 'utility:zoomout' }
+    
+]
+
+const ICON_CATEGORIES = [ 'standard', 'custom', 'utility', 'action'];
+
+const MODES = {
+    ACCORDION: 'accordion',
+    TAB: 'tab',
+    COMBOBOX: 'combobox'
+}
+const CLASSES = {
+    OPEN: 'slds-is-open'
+}
+
+const SEARCHBOX_ICONS = {
+    CLEAR: 'utility:clear',
+    SEARCH: 'utility:search'
+}
+
+const DEFAULT_MAX_RESULTS = 100;
+
+const columns = [
+    { label: 'Icon', fieldName: 'id', cellAttributes: { iconName: { fieldName: 'iconName' } } }
+];
+export default class ObjectIconSelector extends LightningElement {
+
+    @track actionIcons = ACTION_ICONS;
+    @track customIcons = CUSTOM_ICONS;
+    @track utilityIcons = UTILITY_ICONS;
+    @track standardIcons = STANDARD_ICONS;
+
+    @track icons = [];
+    @track columns = columns;
+
+    @api hideStandardIcons;
+    @api hideCustomIcons;
+    @api hideUtilityIcons;
+    @api hideActionIcons;
+    
+    @api 
+    get iconCategories() {
+        return this._iconCategories;
+    }
+    set iconCategories(iconCategories) {
+        this._iconCategories = iconCategories;
+        for (let category of ICON_CATEGORIES) {
+            let hideProperty = 'hide' + category.charAt(0).toUpperCase() + category.slice(1) +'Icons';
+            this[hideProperty] = !iconCategories.includes(category);
+        }
+        
+    }
+
+    @api mode;
+    @api label = 'Pick an Icon';
+
+    // accordionMode is a legacy property added for backwards compatability and is not recommended for future use
+    @api
+    get accordionMode() {
+        return this._accordionMode;
+    }
+    set accordionMode(isAccMode) {
+        this._accordionMode = isAccMode;
+        this.mode = isAccMode ? MODES.ACCORDION : MODES.TAB;
+    }
+    _accordionMode;
+
+    @api
+    get iconName() {
+        return this._iconName || null;
+    }
+    set iconName(iconName) {
+        this._iconName = iconName;
+        if (!this.rendered) {
+            return;
+        }
+        if (this.comboboxMode) {
+            this.setComboboxFormatting();
+        }
+        const iconSelectedEvent = new CustomEvent('iconselection', { detail: iconName });
+        this.dispatchEvent(iconSelectedEvent);
+    }
+    _iconName;
+
+    activeSections = [];            // 'S', 'U', 'C', 'A'
+    maxResults = DEFAULT_MAX_RESULTS
+    currentMaxResults = this.maxResults;
+    searchText;
+    noMatchesFoundString = 'No matches found';
+    blockBlur;
+    rendered;
+
+
+    @api isAccordionLoading;        // Reserved for future improvements
+    @api iconPickerButtonLabel; // reserved for future improvements
+
+    @api
+    get tabStyle() {
+        let style;
+        if (this.firstTabHeight) {
+            style = `height: ${this.firstTabHeight}px`;
+        }
+        return style;
+    }
+
+    @api
+    get tableStyle() {
+        return TABLE_STYLE;
+    }
+
+    @api firstTabHeight;
+
+    get tabMode() { return this.mode === MODES.TAB; }
+    get accordionMode() { return this.mode === MODES.ACCORDION; }
+    get comboboxMode() { return this.mode === MODES.COMBOBOX; }
+    get invalidMode() { return !this.tabMode && !this.accordionMode && !this.comboboxMode; }
+
+    get displayedIcons() {
+        return this.filteredIcons.slice(0, this.currentMaxResults);
+    }
+
+    get filteredIcons() {
+        if (!this.searchText)
+            return this.icons;
+
+        return this.icons.filter(icon => {
+            return icon.iconName.toLowerCase().includes(this.searchText);
+        });
+    }
+
+    get resultsExceedMax() {
+        return this.filteredIcons.length > this.currentMaxResults;
+    }
+
+    get loadMoreString() {
+        return 'Load more (' + this.currentMaxResults + ' of ' + this.filteredIcons.length + ' ' + (this.searchText ? 'matches' : 'options') + ' displayed)';
+    }
+
+    get searchboxIcon() {
+        return (this.searchText || this.iconName) ? SEARCHBOX_ICONS.CLEAR : SEARCHBOX_ICONS.SEARCH;
+    }
+
+    get iconOptions() {
+        return this.icons.map(icon => { 
+            return {
+                label: icon.iconName,
+                value: icon.iconName,
+                icon: icon.iconName
+            }
+        });
+    }
+
+    connectedCallback() {
+        if (!this.hideStandardIcons) this.icons.push(...this.standardIcons);
+        if (!this.hideCustomIcons) this.icons.push(...this.customIcons);
+        if (!this.hideUtilityIcons) this.icons.push(...this.utilityIcons);
+        // Action icons display weirdly in the combobox so I'm leaving them out for now
+        //if (!this.hideActionIcons) this.icons.push(...this.actionIcons);
+    }
+
+    renderedCallback() {
+        if (this.rendered) return;
+        this.rendered = true;
+
+        if (this.iconName)
+            this.iconName = this.iconName;
+
+    }
+
+    iconSelected(event) {
+        const selRow = event.detail.selectedRows[0];
+        this.iconName = selRow.iconName;
+        // Moving the dispatch to iconName setter
+        // const iconSelectedEvent = new CustomEvent('iconselection', { detail: this.iconName });
+        // this.dispatchEvent(iconSelectedEvent);
+    }
+
+
+    doSearch(searchText) {
+        this.searchText = searchText ? searchText.toLowerCase() : null;
+        this.showList();
+    }
+
+    showList() {
+        this.addClass('.slds-dropdown-trigger', CLASSES.OPEN);
+        this.focusSearchbox();
+    }
+
+    hideList() {
+        this.removeClass('.slds-dropdown-trigger', CLASSES.OPEN);
+    }
+
+    loadMore() {
+        this.currentMaxResults += this.maxResults;
+    }
+
+    focusSearchbox() {
+        this.template.querySelector('.comboboxInput').focus();
+    }
+
+    blurSearchbox() {
+        this.template.querySelector('.comboboxInput').blur();
+    }
+
+    clearSearchbox() {
+        this.iconName = null;
+        this.blockBlur = true;
+        this.doSearch();
+    }
+
+    setComboboxFormatting() {
+        if (this.iconName) {
+            this.addClass('.comboboxInput', 'slds-combobox__input-value');
+            this.switchClass('.slds-combobox__form-element', 'slds-input-has-icon_right', 'slds-input-has-icon_left-right');
+            this.addClass('.slds-combobox_container', 'slds-has-selection');
+            this.template.querySelector('.comboboxInput').setAttribute('readonly', '');
+            this.template.querySelector('.comboboxInput').value = this.iconName;
+            this.blurSearchbox();
+        } else {
+            this.removeClass('.comboboxInput', 'slds-combobox__input-value');
+            this.switchClass('.slds-combobox__form-element', 'slds-input-has-icon_left-right', 'slds-input-has-icon_right');
+            this.removeClass('.slds-combobox_container', 'slds-has-selection');
+            this.template.querySelector('.comboboxInput').removeAttribute('readonly');
+            this.template.querySelector('.comboboxInput').value = null;
+        }
+    }
+
+
+    /* EVENT HANDLERS */
+    handleIconSelect(event) {
+        let icon = event.currentTarget.dataset.icon;
+        this.iconName = icon;
+    }
+
+    handleSearchFocus(event) {
+        if (!this.iconName)
+            this.doSearch(event.currentTarget.value);
+    }
+
+    handleSearchChange(event) {
+        this.doSearch(event.currentTarget.value);
+    }
+
+    handleSearchBlur() {
+        if (this.blockBlur) {
+            this.focusSearchbox();
+            this.blockBlur = false;
+        } else {
+            this.currentMaxResults = this.maxResults;
+            this.hideList();
+        }
+    }
+
+    handleDropdownClick() {
+        this.blockBlur = true;
+    }
+
+    handleSearchboxIconClick(event) {
+        if (event.currentTarget.iconName == SEARCHBOX_ICONS.CLEAR) {
+            this.clearSearchbox();
+        } else {
+            this.doSearch();
+        }
+    }
+
+    handleComboboxChange(event) {
+        this.iconName = event.detail.value;
+    }
+
+    /* UTITLITY FUNCTIONS */
+    addClass(selector, className) {
+        let el = this.template.querySelector(selector);
+        if (el)
+            el.classList.add(className);
+        return !!el;
+    }
+
+    removeClass(selector, className) {
+        let el = this.template.querySelector(selector);
+        if (el)
+            el.classList.remove(className);
+        return !!el;
+    }
+
+    switchClass(selector, removeClass, addClass) {
+        this.removeClass(selector, removeClass);
+        this.addClass(selector, addClass);
+    }
+
+    /* LEGACY PROPERTIES */
+    @api showAccordion;
+    @api hideAccordion;
+}
diff --git a/force-app/main/default/lwc/iconSelector/iconSelector.js-meta.xml b/force-app/main/default/lwc/iconSelector/iconSelector.js-meta.xml
new file mode 100644
index 0000000..d27a5dc
--- /dev/null
+++ b/force-app/main/default/lwc/iconSelector/iconSelector.js-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>51.0</apiVersion>
+    <isExposed>true</isExposed>
+    <masterLabel>Pick an Icon</masterLabel>
+    <description>Icon Picker</description>
+    <targets>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <!-- Custom Property Editor (CPE) properties-->
+            <property name="iconCategories" type="String" role="inputOnly"/>
+            <property name="mode" label="Display Mode" type="String" description="Enter 'tab', 'accordion', or 'combobox'" role="inputOnly"/>
+            <property name="label" label="Label" type="String" default="Pick an Icon" role="inputOnly"/>
+
+            <property name="iconName" label="Icon Name" type="String"/>
+
+            <!-- These properties are available to be set via API but are not exposed in the CPE -->
+            <property name="hideStandardIcons" label="Hide Standard icons" type="Boolean" default="false" role="inputOnly"/>
+            <property name="hideCustomIcons" label="Hide Custom icons" type="Boolean" default="false" role="inputOnly"/>
+            <property name="hideUtilityIcons" label="Hide Utility icons" type="Boolean" default="false" role="inputOnly"/>
+            <property name="hideActionIcons" label="Hide Action icons" type="Boolean" default="false" description="Note: Action icons are not available in combobox mode" role="inputOnly"/>
+
+            <!-- Legacy properties -->
+            <property name="accordionMode" label="zzz(legacy) Accordion Mode" description="This is a legacy property included for backwards compatibility and is not recommended for future use. Use the new 'mode' property instead." type="boolean" role="inputOnly"/>
+        </targetConfig>
+    </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file