diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte
index b518ac3d92..304ffa6b48 100644
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@@ -13,6 +13,10 @@
   export let size = "M"
   export let active = false
   export let fullWidth = false
+  export let autofocus = false
+
+  let focus = false
+  $: focus = autofocus
 
   function longPress(element) {
     if (!longPressable) return
@@ -44,9 +48,16 @@
   class:fullWidth
   class="spectrum-ActionButton spectrum-ActionButton--size{size}"
   class:active
+  class:is-focused={focus}
   {disabled}
   on:longPress
   on:click|preventDefault
+  on:focus={() => {
+    focus = true
+  }}
+  on:blur={() => {
+    focus = false
+  }}
 >
   {#if longPressable}
     <svg
@@ -80,4 +91,10 @@
   .active svg {
     color: var(--spectrum-global-color-blue-600);
   }
+  button.is-focused {
+    border-color: var(
+      --spectrum-textfield-m-border-color-down,
+      var(--spectrum-alias-border-color-mouse-focus)
+    );
+  }
 </style>
diff --git a/packages/bbui/src/Form/Core/Combobox.svelte b/packages/bbui/src/Form/Core/Combobox.svelte
index 183e7486ff..c3f907e64a 100644
--- a/packages/bbui/src/Form/Core/Combobox.svelte
+++ b/packages/bbui/src/Form/Core/Combobox.svelte
@@ -56,8 +56,12 @@
       bind:this={comboInput}
       {id}
       type="text"
-      on:focus={() => (focus = true)}
-      on:blur={() => (focus = false)}
+      on:focus={() => {
+        focus = true
+      }}
+      on:blur={() => {
+        focus = false
+      }}
       on:change={onType}
       value={value || ""}
       placeholder={placeholder || ""}
diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
index 3525e66fb4..c78d728e7f 100644
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@@ -118,20 +118,14 @@ filterTests(['all'], () => {
           cy.get("[data-cy=setting-field] .spectrum-InputGroup")
           .should("have.class", "is-focused").within(() => {
             cy.get("input").should(($input) => {
-              expect($input).to.have.length(1)
               inputClasses = Cypress.$($input).attr('class')
             })
           })
-
-          cy.focused().then(($focused) => {
-            const focusedClasses = Cypress.$($focused).attr('class')
-            expect(inputClasses).to.equal(focusedClasses)
-          })
         }
 
         const testFieldFocusOnCreate = (componentLabel) => {
           let inputClasses
-
+          cy.log("Adding: " + componentLabel)
           cy.addComponent("Form", componentLabel).then((componentId) => {
            
             refocusTest(componentId)
@@ -139,15 +133,10 @@ filterTests(['all'], () => {
             cy.get("[data-cy=setting-field] .spectrum-InputGroup")
             .should("have.class", "is-focused").within(() => {
               cy.get("input").should(($input) => {
-                expect($input).to.have.length(1)
                 inputClasses = Cypress.$($input).attr('class')
               })
             })
           })
-          cy.focused().then(($focused) => {
-            const focusedClasses = Cypress.$($focused).attr('class')
-            expect(inputClasses).to.equal(focusedClasses)
-          })
         }
 
         componentTypeLabels.forEach( testFieldFocusOnCreate )
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 3b94a2713e..3e7ceb2efc 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -425,8 +425,10 @@ export const getFrontendStore = () => {
           state.currentView = "component"
           state.selectedComponentId = componentInstance._id
 
-          const focusSetting = definition.settings.filter((setting) => { return setting.required })
-          const mappedSettings = focusSetting.map((setting) => {
+          const focusSetting = definition.settings.filter(setting => {
+            return setting.required
+          })
+          const mappedSettings = focusSetting.map(setting => {
             return {
               key: setting.key,
               target: state.selectedComponentId,
@@ -434,7 +436,7 @@ export const getFrontendStore = () => {
             }
           })
 
-          if(focusSetting.length){
+          if (focusSetting.length) {
             state.builderFocus = mappedSettings
           }
           return state
diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
index 47ca57bc38..f58b3444ac 100644
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@@ -210,7 +210,7 @@
         store.update(state => ({
           ...state,
           builderFocus : 
-          [{...data}]
+          [...data]
         }))
       } else {
         console.warn(`Client sent unknown event type: ${type}`)
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte
index 5f70a81c2b..7c4818beff 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte
@@ -15,6 +15,7 @@
 
   export let value = ""
   export let maxIconsPerPage = 30
+  export let autofocus = false
 
   let searchTerm = ""
   let selectedLetter = "A"
@@ -117,7 +118,9 @@
 </script>
 
 <div bind:this={buttonAnchor}>
-  <ActionButton on:click={dropdown.show}>{displayValue}</ActionButton>
+  <ActionButton on:click={dropdown.show} {autofocus}>
+    {displayValue}
+  </ActionButton>
 </div>
 <Popover bind:this={dropdown} on:open={setSelectedUI} anchor={buttonAnchor}>
   <div class="container">
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/URLSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/URLSelect.svelte
index dc2fa7ad89..581f0e7fd2 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/URLSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/URLSelect.svelte
@@ -4,6 +4,7 @@
 
   export let value
   export let bindings
+  export let autofocus
 
   $: urlOptions = $store.screens
     .map(screen => screen.routing?.route)
@@ -16,4 +17,5 @@
   on:change
   options={urlOptions}
   appendBindingsAsOptions={false}
+  {autofocus}
 />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
index 8195c20ab7..5aa66305f4 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
@@ -201,7 +201,6 @@
       class="components-pane"
       use:clickOutside={() => {
         if ($store?.builderFocus) {
-          console.log($store?.builderFocus)
           const otherSettings = $store?.builderFocus?.filter(field => {
             return field.location !== "component_settings"
           })
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index a41b497630..e33116eba8 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1034,7 +1034,8 @@
       {
         "type": "icon",
         "label": "Icon",
-        "key": "icon"
+        "key": "icon",
+        "required": true
       },
       {
         "type": "select",
diff --git a/packages/client/src/components/app/BackgroundImage.svelte b/packages/client/src/components/app/BackgroundImage.svelte
index fe6a9834ad..43eede632e 100644
--- a/packages/client/src/components/app/BackgroundImage.svelte
+++ b/packages/client/src/components/app/BackgroundImage.svelte
@@ -34,11 +34,13 @@
         <span
           class="showMe spectrum-Link"
           on:click={() => {
-            builderStore.actions.setFocus({
-              location: "component_settings",
-              key: "url",
-              target: $component.id,
-            })
+            builderStore.actions.setFocus([
+              {
+                location: "component_settings",
+                key: "url",
+                target: $component.id,
+              },
+            ])
           }}
         >
           Show me
diff --git a/packages/client/src/components/app/Icon.svelte b/packages/client/src/components/app/Icon.svelte
index 829cc60227..da59fe71f2 100644
--- a/packages/client/src/components/app/Icon.svelte
+++ b/packages/client/src/components/app/Icon.svelte
@@ -28,14 +28,29 @@
   />
 {:else if $builderStore.inBuilder}
   <div use:styleable={styles}>
-    <Placeholder />
+    <Placeholder>
+      <div slot="content">
+        Add the <mark>Icon</mark> in the settings menu&nbsp;
+        <span
+          class="showMe spectrum-Link"
+          on:click={() => {
+            builderStore.actions.setFocus([
+              {
+                location: "component_settings",
+                key: "icon",
+                target: $component.id,
+              },
+            ])
+          }}
+        >
+          Show me
+        </span>
+      </div>
+    </Placeholder>
   </div>
 {/if}
 
 <style>
-  div {
-    font-style: italic;
-  }
   @media (hover: hover) {
     .hoverable:hover {
       color: var(--spectrum-alias-icon-color-selected-hover) !important;
diff --git a/packages/client/src/components/app/Image.svelte b/packages/client/src/components/app/Image.svelte
index 4cd3a4446d..84e94fa282 100644
--- a/packages/client/src/components/app/Image.svelte
+++ b/packages/client/src/components/app/Image.svelte
@@ -21,11 +21,13 @@
         <span
           class="showMe spectrum-Link"
           on:click={() => {
-            builderStore.actions.setFocus({
-              location: "component_settings",
-              key: "url",
-              target: $component.id,
-            })
+            builderStore.actions.setFocus([
+              {
+                location: "component_settings",
+                key: "url",
+                target: $component.id,
+              },
+            ])
           }}
         >
           Show me
diff --git a/packages/client/src/components/app/MarkdownViewer.svelte b/packages/client/src/components/app/MarkdownViewer.svelte
index 38d9b0fdc3..95d23e47f1 100644
--- a/packages/client/src/components/app/MarkdownViewer.svelte
+++ b/packages/client/src/components/app/MarkdownViewer.svelte
@@ -21,11 +21,13 @@
         <span
           class="showMe spectrum-Link"
           on:click={() => {
-            builderStore.actions.setFocus({
-              location: "component_settings",
-              key: "value",
-              target: $component.id,
-            })
+            builderStore.actions.setFocus([
+              {
+                location: "component_settings",
+                key: "value",
+                target: $component.id,
+              },
+            ])
           }}
         >
           Show me
diff --git a/packages/client/src/components/app/charts/ApexChart.svelte b/packages/client/src/components/app/charts/ApexChart.svelte
index 7063de8e6c..5e196e4c90 100644
--- a/packages/client/src/components/app/charts/ApexChart.svelte
+++ b/packages/client/src/components/app/charts/ApexChart.svelte
@@ -15,16 +15,27 @@
   <div use:styleable={$component.styles}>
     <Placeholder>
       <div slot="content">
-        Use the settings panel to select a <mark>Provider</mark> and start
-        building your chart&nbsp;
+        Use the settings panel start building your chart&nbsp;
         <span
           class="showMe spectrum-Link"
           on:click={() => {
-            builderStore.actions.setFocus({
-              location: "component_settings",
-              key: "dataProvider",
-              target: $component.id,
-            })
+            builderStore.actions.setFocus([
+              {
+                location: "component_settings",
+                key: "dataProvider",
+                target: $component.id,
+              },
+              {
+                location: "component_settings",
+                key: "valueColumns",
+                target: $component.id,
+              },
+              {
+                location: "component_settings",
+                key: "dataColumns",
+                target: $component.id,
+              },
+            ])
           }}
         >
           Show me
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index c9adba3b70..30d30637a3 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -84,11 +84,13 @@
               <span
                 class="showMe spectrum-Link"
                 on:click={() => {
-                  builderStore.actions.setFocus({
-                    location: "component_settings",
-                    key: "field",
-                    target: $component.id,
-                  })
+                  builderStore.actions.setFocus([
+                    {
+                      location: "component_settings",
+                      key: "field",
+                      target: $component.id,
+                    },
+                  ])
                 }}
               >
                 Show me
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 084f7e7d43..59ba94a636 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -78,7 +78,7 @@ const createBuilderStore = () => {
     },
     setFocus: data => {
       window.parent.postMessage({ type: "builder-focus", data })
-    }
+    },
   }
   return {
     ...store,