diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index fe66a7fe35..a303b0262f 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -32,7 +32,11 @@
     $builderStore.previewType === "layout" || screenslotContext
 
   // Update component context
-  $: componentStore.set({ id, styles: { ...styles, id, allowSelection } })
+  $: componentStore.set({
+    id,
+    children: children.length,
+    styles: { ...styles, id, allowSelection },
+  })
 
   // Gets the component constructor for the specified component
   const getComponentConstructor = component => {
diff --git a/packages/standard-components/src/Icon.svelte b/packages/standard-components/src/Icon.svelte
index 6b3b1554fb..34ebd95941 100644
--- a/packages/standard-components/src/Icon.svelte
+++ b/packages/standard-components/src/Icon.svelte
@@ -1,13 +1,19 @@
 <script>
   import { getContext } from "svelte"
 
-  // Add this back once we can define specific design options to expose
-  // const { styleable } = getContext("sdk")
-  // const component = getContext("component")
+  const { styleable } = getContext("sdk")
+  const component = getContext("component")
 
   export let icon = ""
   export let size = "fa-lg"
-  export let color = "#000"
+  export let color = "#f00"
+  $: styles = {
+    ...$component.styles,
+    normal: {
+      ...$component.styles.normal,
+      color,
+    },
+  }
 </script>
 
-<i style={`color: ${color};`} class={`${icon} ${size}`} />
+<i use:styleable={styles} class="{icon} {size}" />
diff --git a/packages/standard-components/src/List.svelte b/packages/standard-components/src/List.svelte
index 1a5638404a..78cd6697a2 100644
--- a/packages/standard-components/src/List.svelte
+++ b/packages/standard-components/src/List.svelte
@@ -24,9 +24,27 @@
 </script>
 
 <div use:styleable={$component.styles}>
-  {#each rows as row}
-    <DataProvider {row}>
-      <slot />
-    </DataProvider>
-  {/each}
+  {#if rows.length > 0}
+    {#each rows as row}
+      <DataProvider {row}>
+        {#if $component.children === 0}
+          <p>Add some components too.</p>
+        {:else}
+          <slot />
+        {/if}
+      </DataProvider>
+    {/each}
+  {:else}
+    <p>Feed me some data</p>
+  {/if}
 </div>
+
+<style>
+  p {
+    display: grid;
+    place-items: center;
+    background: #f5f5f5;
+    border: #ccc 1px solid;
+    padding: var(--spacing-m);
+  }
+</style>