diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
index 97622098cd..383026c4f8 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
@@ -64,10 +64,8 @@
         <Detail>Customize</Detail>
       </div>
       <div class="info">
-        <div class="infoHeader">
-          <Icon name="InfoOutline" />
-          <Body size="S">These settings apply to all screens</Body>
-        </div>
+        <Icon name="InfoOutline" size="S" />
+        <Body size="S">These settings apply to all screens</Body>
       </div>
       <div class="configureLinks">
         <LinksEditor />
@@ -210,22 +208,14 @@
   .info {
     background-color: var(--background-alt);
     padding: 12px;
-    margin-bottom: 12px;
-  }
-
-  .infoHeader {
     display: flex;
-    margin-bottom: 5px;
     border-radius: 4px;
+    gap: 4px;
+    margin-bottom: 16px;
   }
-
-  .infoHeader :global(svg) {
+  .info :global(svg) {
     margin-right: 5px;
-    color: var(--grey-6);
-  }
-
-  .infoHeader :global(p) {
-    color: var(--grey-7);
+    color: var(--spectrum-global-color-gray-600);
   }
 
   .configureLinks :global(button) {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
index f3f2e63cce..13a008fae0 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
@@ -29,13 +29,8 @@
 </script>
 
 <div class="info">
-  <div class="infoHeader">
-    <Icon name="InfoOutline" size="S" />
-    <Body size="XS">CHANGES WILL APPLY TO ALL SCREENS</Body>
-  </div>
-  <Body size="S">
-    Your theme is configured for all the screens within your app.
-  </Body>
+  <Icon name="InfoOutline" size="S" />
+  <Body size="S">These settings apply to all screens</Body>
 </div>
 <Layout noPadding gap="S">
   <Layout noPadding gap="XS">
@@ -68,26 +63,16 @@
   />
 </Layout>
 
-<!-- Add this to its own component -->
 <style>
-  .infoHeader {
-    display: flex;
-    margin-bottom: 5px;
-    border-radius: 4px;
-  }
-
-  .infoHeader :global(svg) {
-    margin-right: 5px;
-    color: var(--grey-6);
-  }
-
-  .infoHeader :global(p) {
-    color: var(--grey-6);
-  }
-
   .info {
     background-color: var(--background-alt);
     padding: 12px;
-    margin-bottom: 12px;
+    display: flex;
+    border-radius: 4px;
+    gap: 4px;
+  }
+  .info :global(svg) {
+    margin-right: 5px;
+    color: var(--spectrum-global-color-gray-600);
   }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
index d9c98bda66..778fa303cc 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
@@ -6,8 +6,8 @@
   import { capitalise } from "helpers"
   import { ActionButton, Layout } from "@budibase/bbui"
 
-  let activeTab = "settings"
-  const tabs = ["settings", "theme"]
+  let activeTab = "general"
+  const tabs = ["general", "theme"]
 </script>
 
 <Panel
