diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 178e16b6c0..72ca56affa 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from 'react'
+import React, { memo, useState } from 'react'
 import {
   Box,
   Switch,
@@ -18,16 +18,17 @@ import useDispatch from '../hooks/useDispatch'
 import { useSelector } from 'react-redux'
 import { getComponents } from '../core/selectors/components'
 import { getShowLayout, getShowCode } from '../core/selectors/app'
-// import { createShareUrl } from '../utils/share'
-// import useClipboard from '../hooks/useClipboard'
 
 const CodeSandboxButton = () => {
   const components = useSelector(getComponents)
+  const [isLoading, setIsLoading] = useState(false)
 
   return (
     <Button
       onClick={async () => {
+        setIsLoading(true)
         const code = await generateCode(components)
+        setIsLoading(false)
         const parameters = buildParameters(code)
 
         window.open(
@@ -35,6 +36,7 @@ const CodeSandboxButton = () => {
           '_blank',
         )
       }}
+      isLoading={isLoading}
       rightIcon="external-link"
       variant="ghost"
       size="xs"
@@ -44,26 +46,6 @@ const CodeSandboxButton = () => {
   )
 }
 
-/*
-const ShareButton = () => {
-  const components = useSelector(getComponents)
-
-  const { onCopy, hasCopied } = useClipboard()
-
-  const copy = () => {
-    if (onCopy) {
-      onCopy(createShareUrl(components))
-    }
-  }
-
-  return (
-    <Button onClick={copy} rightIcon="external-link" variant="ghost" size="xs">
-      {hasCopied ? 'Copied' : 'Share'}
-    </Button>
-  )
-}
-*/
-
 const Header = () => {
   const showLayout = useSelector(getShowLayout)
   const showCode = useSelector(getShowCode)
diff --git a/src/components/inspector/panels/components/IconButtonPanel.tsx b/src/components/inspector/panels/components/IconButtonPanel.tsx
index 68602ae44a..5c29b9dd4e 100644
--- a/src/components/inspector/panels/components/IconButtonPanel.tsx
+++ b/src/components/inspector/panels/components/IconButtonPanel.tsx
@@ -28,10 +28,10 @@ const IconButtonPanel = () => {
           name="icon"
         >
           {Object.keys(theme.icons)
-            .filter(icon => icon.includes(icon) || !icon)
-            .map((icon, index) => (
-              <ComboboxOption key={index} value={icon}>
-                <Icon name={icon as Icons} /> <ComboboxOptionText />
+            .filter(item => item.includes(icon) || !icon)
+            .map((item, index) => (
+              <ComboboxOption key={index} value={item}>
+                <Icon name={item as Icons} /> <ComboboxOptionText />
               </ComboboxOption>
             ))}
         </InputSuggestion>
diff --git a/src/utils/defaultProps.tsx b/src/utils/defaultProps.tsx
index 2fbc7544a6..7015729ea1 100644
--- a/src/utils/defaultProps.tsx
+++ b/src/utils/defaultProps.tsx
@@ -170,7 +170,7 @@ export const DEFAULT_PROPS: PreviewDefaultProps = {
     variant: 'subtle',
   },
   Box: Box.defaultProps,
-  Button: { ...Button.defaultProps, children: 'Lorem Ipsum' },
+  Button: { ...Button.defaultProps, children: 'Lorem Ipsum', variant: 'solid' },
   Divider: { borderColor: 'blackAlpha.500' },
   IconButton: {
     ...IconButton.defaultProps,
@@ -183,7 +183,6 @@ export const DEFAULT_PROPS: PreviewDefaultProps = {
     ...Image.defaultProps,
     height: '100px',
     width: '100px',
-    fallbackSrc: 'https://via.placeholder.com/150',
   },
   Text: { ...Text.defaultProps, children: 'Lorem Ipsum' },
   Progress: { ...Progress.defaultProps, size: 'md' },