diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
index aab96d97b8..ce939e02e3 100644
--- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
@@ -141,15 +141,15 @@
   li {
     display: flex;
     font-family: var(--font-sans);
-    font-size: var(--font-size-xs);
+    font-size: var(--font-size-s);
     color: var(--grey-7);
     padding: var(--spacing-m);
     margin: auto 0px;
     align-items: center;
     cursor: pointer;
-    border-radius: var(--spacing-s);
-    border: var(--border-light);
+    border-top: var(--border-light);
     border-width: 1px 0 1px 0;
+    border-radius: 4px;
   }
 
   pre,
diff --git a/packages/builder/src/components/settings/ThemeEditorDropdown.svelte b/packages/builder/src/components/settings/ThemeEditorDropdown.svelte
index 5dc16cb3d6..b7a6d4e6ad 100644
--- a/packages/builder/src/components/settings/ThemeEditorDropdown.svelte
+++ b/packages/builder/src/components/settings/ThemeEditorDropdown.svelte
@@ -1,27 +1,23 @@
 <script>
-  import { Icon, Label, Popover } from "@budibase/bbui"
+  import { Icon, Label, Modal, ModalContent } from "@budibase/bbui"
   import ThemeEditor from "./ThemeEditor.svelte"
 
-  let anchor
-  let popover
+  let modal
 </script>
 
-<div class="topnavitemright" on:click={popover.show} bind:this={anchor}>
+<div class="topnavitemright" on:click={modal.show}>
   <Icon hoverable name="ColorFill" />
 </div>
-<div class="dropdown">
-  <Popover bind:this={popover} {anchor} align="right">
-    <div class="content">
-      <Label extraSmall grey>Theme</Label>
-      <ThemeEditor />
-    </div>
-  </Popover>
-</div>
+<Modal bind:this={modal}>
+  <ModalContent
+    title="Builder Theme"
+    confirmText="Done"
+    showCancelButton={false}>
+    <ThemeEditor />
+  </ModalContent>
+</Modal>
 
 <style>
-  .dropdown {
-    z-index: 2;
-  }
   .topnavitemright {
     cursor: pointer;
     color: var(--grey-7);
@@ -35,7 +31,4 @@
     height: 24px;
     width: 24px;
   }
-  .content {
-    padding: var(--spacing-xl);
-  }
 </style>
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index eca8bcbd03..b9ad92dca8 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -162,14 +162,14 @@
         <Button medium secondary on:click={() => $currentStep--}>Back</Button>
       {/if}
       {#if $currentStep < steps.length - 1}
-        <Button medium blue on:click={() => $currentStep++} disabled={!valid}>
+        <Button medium cta on:click={() => $currentStep++} disabled={!valid}>
           Next
         </Button>
       {/if}
       {#if $currentStep === steps.length - 1}
         <Button
           medium
-          blue
+          cta
           on:click={createNewApp}
           disabled={!valid || submitting}>
           {submitting ? 'Loading...' : 'Submit'}
diff --git a/packages/builder/src/pages/builder/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/_layout.svelte
index 028fb3bbdf..5bc50b9afd 100644
--- a/packages/builder/src/pages/builder/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/_layout.svelte
@@ -20,7 +20,7 @@
   let selected = $isActive("./datasource") ? "External" : "Internal"
 
   function selectFirstTableOrSource({ detail }) {
-    const { key } = tabs.find((t) => t.title === detail)
+    const { key } = tabs.find(t => t.title === detail)
     if (key === "datasource") {
       $goto("./datasource")
     } else {
@@ -54,8 +54,7 @@
     </Tabs>
     <div
       class="add-button"
-      data-cy={`new-${selected === "External" ? "datasource" : "tabel"}`}
-    >
+      data-cy={`new-${selected === 'External' ? 'datasource' : 'tabel'}`}>
       <Icon hoverable name="AddCircle" on:click={modal.show} />
     </div>
   </div>
@@ -82,6 +81,10 @@
     align-items: stretch;
     gap: var(--spacing-l);
   }
+  .content :global(> span) {
+    display: contents;
+  }
+
   .tab-content-padding {
     padding: 0 var(--spacing-xl);
   }
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index b8168e7bfc..163caa3dbc 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -101,8 +101,8 @@
     }
   },
   "stackedlist": {
-    "name": "TaskList",
-    "icon": "ri-archive-drawer-line",
+    "name": "Stacked List",
+    "icon": "TaskList",
     "description": "A basic card component that can contain content and actions.",
     "styleable": true,
     "settings": [