diff --git a/apps/docs/static/api/open-api-schema.json b/apps/docs/static/api/open-api-schema.json
index d101285ea..5791847a3 100644
--- a/apps/docs/static/api/open-api-schema.json
+++ b/apps/docs/static/api/open-api-schema.json
@@ -4387,7 +4387,7 @@
                             "enum": ["input", "icon"]
                           },
                           "logoDisplay": {
-                            "default": "logo",
+                            "default": "logoAndText",
                             "type": "string",
                             "enum": ["logo", "logoAndText"]
                           },
diff --git a/apps/nextjs/src/components/layout/header/configurable-header.module.css b/apps/nextjs/src/components/layout/header/configurable-header.module.css
index 692adbad2..2b851745d 100644
--- a/apps/nextjs/src/components/layout/header/configurable-header.module.css
+++ b/apps/nextjs/src/components/layout/header/configurable-header.module.css
@@ -16,7 +16,10 @@
   display: flex;
   align-items: center;
   gap: var(--mantine-spacing-sm);
+  box-sizing: border-box;
   min-width: 0;
+  height: 100%;
+  padding-inline-end: rem(10px);
   overflow-x: auto;
   scrollbar-width: none;
 }
diff --git a/packages/db/migrations/mysql/0048_add_header_preferences_and_branding.sql b/packages/db/migrations/mysql/0048_add_header_preferences_and_branding.sql
index f9f1439a3..ecd59a95c 100644
--- a/packages/db/migrations/mysql/0048_add_header_preferences_and_branding.sql
+++ b/packages/db/migrations/mysql/0048_add_header_preferences_and_branding.sql
@@ -1,4 +1,4 @@
-ALTER TABLE `user` ADD `header_preferences` text DEFAULT ('{"version":3,"visible":true,"searchDisplay":"input","logoDisplay":"logo","zones":{"left":[{"type":"builtin","id":"logo"}],"center":[{"type":"builtin","id":"search"}],"right":[{"type":"builtin","id":"boardEdit"},{"type":"builtin","id":"boardSettings"},{"type":"builtin","id":"user"}]}}') NOT NULL;
+ALTER TABLE `user` ADD `header_preferences` text DEFAULT ('{"version":3,"visible":true,"searchDisplay":"input","logoDisplay":"logoAndText","zones":{"left":[{"type":"builtin","id":"logo"}],"center":[{"type":"builtin","id":"search"}],"right":[{"type":"builtin","id":"boardEdit"},{"type":"builtin","id":"boardSettings"},{"type":"builtin","id":"user"}]}}') NOT NULL;
 --> statement-breakpoint
 INSERT IGNORE INTO `serverSetting` (`setting_key`, `value`)
 VALUES ('branding', '{"json":{"appName":"Homarr","greeting":"","logoImageUrl":null,"faviconImageUrl":null,"primaryColor":"#fa5252","secondaryColor":"#fd7e14","lockPrimaryColor":false,"signInBackgroundImageUrl":null,"signInBackgroundOverlay":0.55,"authBranding":{"showAppName":true,"showLogo":true,"showGreeting":true},"defaultRadius":"md"}}');
diff --git a/packages/db/migrations/mysql/meta/0048_snapshot.json b/packages/db/migrations/mysql/meta/0048_snapshot.json
index 3edeaffc4..6e717a2aa 100644
--- a/packages/db/migrations/mysql/meta/0048_snapshot.json
+++ b/packages/db/migrations/mysql/meta/0048_snapshot.json
@@ -2620,7 +2620,7 @@
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "('{\"version\":3,\"visible\":true,\"searchDisplay\":\"input\",\"logoDisplay\":\"logo\",\"zones\":{\"left\":[{\"type\":\"builtin\",\"id\":\"logo\"}],\"center\":[{\"type\":\"builtin\",\"id\":\"search\"}],\"right\":[{\"type\":\"builtin\",\"id\":\"boardEdit\"},{\"type\":\"builtin\",\"id\":\"boardSettings\"},{\"type\":\"builtin\",\"id\":\"user\"}]}}')"
+          "default": "('{\"version\":3,\"visible\":true,\"searchDisplay\":\"input\",\"logoDisplay\":\"logoAndText\",\"zones\":{\"left\":[{\"type\":\"builtin\",\"id\":\"logo\"}],\"center\":[{\"type\":\"builtin\",\"id\":\"search\"}],\"right\":[{\"type\":\"builtin\",\"id\":\"boardEdit\"},{\"type\":\"builtin\",\"id\":\"boardSettings\"},{\"type\":\"builtin\",\"id\":\"user\"}]}}')"
         },
         "completed_manage_tour": {
           "name": "completed_manage_tour",
diff --git a/packages/db/migrations/postgresql/0014_add_header_preferences_and_branding.sql b/packages/db/migrations/postgresql/0014_add_header_preferences_and_branding.sql
index 3325bab84..1947ce098 100644
--- a/packages/db/migrations/postgresql/0014_add_header_preferences_and_branding.sql
+++ b/packages/db/migrations/postgresql/0014_add_header_preferences_and_branding.sql
@@ -1,4 +1,4 @@
-ALTER TABLE "user" ADD COLUMN "header_preferences" text DEFAULT '{"version":3,"visible":true,"searchDisplay":"input","logoDisplay":"logo","zones":{"left":[{"type":"builtin","id":"logo"}],"center":[{"type":"builtin","id":"search"}],"right":[{"type":"builtin","id":"boardEdit"},{"type":"builtin","id":"boardSettings"},{"type":"builtin","id":"user"}]}}' NOT NULL;
+ALTER TABLE "user" ADD COLUMN "header_preferences" text DEFAULT '{"version":3,"visible":true,"searchDisplay":"input","logoDisplay":"logoAndText","zones":{"left":[{"type":"builtin","id":"logo"}],"center":[{"type":"builtin","id":"search"}],"right":[{"type":"builtin","id":"boardEdit"},{"type":"builtin","id":"boardSettings"},{"type":"builtin","id":"user"}]}}' NOT NULL;
 --> statement-breakpoint
 INSERT INTO "serverSetting" ("setting_key", "value")
 VALUES ('branding', '{"json":{"appName":"Homarr","greeting":"","logoImageUrl":null,"faviconImageUrl":null,"primaryColor":"#fa5252","secondaryColor":"#fd7e14","lockPrimaryColor":false,"signInBackgroundImageUrl":null,"signInBackgroundOverlay":0.55,"authBranding":{"showAppName":true,"showLogo":true,"showGreeting":true},"defaultRadius":"md"}}')
diff --git a/packages/db/migrations/postgresql/meta/0014_snapshot.json b/packages/db/migrations/postgresql/meta/0014_snapshot.json
index 8e5cdd87d..6ee6eb934 100644
--- a/packages/db/migrations/postgresql/meta/0014_snapshot.json
+++ b/packages/db/migrations/postgresql/meta/0014_snapshot.json
@@ -2485,7 +2485,7 @@
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "default": "'{\"version\":3,\"visible\":true,\"searchDisplay\":\"input\",\"logoDisplay\":\"logo\",\"zones\":{\"left\":[{\"type\":\"builtin\",\"id\":\"logo\"}],\"center\":[{\"type\":\"builtin\",\"id\":\"search\"}],\"right\":[{\"type\":\"builtin\",\"id\":\"boardEdit\"},{\"type\":\"builtin\",\"id\":\"boardSettings\"},{\"type\":\"builtin\",\"id\":\"user\"}]}}'"
+          "default": "'{\"version\":3,\"visible\":true,\"searchDisplay\":\"input\",\"logoDisplay\":\"logoAndText\",\"zones\":{\"left\":[{\"type\":\"builtin\",\"id\":\"logo\"}],\"center\":[{\"type\":\"builtin\",\"id\":\"search\"}],\"right\":[{\"type\":\"builtin\",\"id\":\"boardEdit\"},{\"type\":\"builtin\",\"id\":\"boardSettings\"},{\"type\":\"builtin\",\"id\":\"user\"}]}}'"
         },
         "completed_manage_tour": {
           "name": "completed_manage_tour",
diff --git a/packages/db/migrations/sqlite/0046_add_header_preferences_and_branding.sql b/packages/db/migrations/sqlite/0046_add_header_preferences_and_branding.sql
index 789638134..6b427c781 100644
--- a/packages/db/migrations/sqlite/0046_add_header_preferences_and_branding.sql
+++ b/packages/db/migrations/sqlite/0046_add_header_preferences_and_branding.sql
@@ -1,4 +1,4 @@
-ALTER TABLE `user` ADD `header_preferences` text DEFAULT '{"version":3,"visible":true,"searchDisplay":"input","logoDisplay":"logo","zones":{"left":[{"type":"builtin","id":"logo"}],"center":[{"type":"builtin","id":"search"}],"right":[{"type":"builtin","id":"boardEdit"},{"type":"builtin","id":"boardSettings"},{"type":"builtin","id":"user"}]}}' NOT NULL;
+ALTER TABLE `user` ADD `header_preferences` text DEFAULT '{"version":3,"visible":true,"searchDisplay":"input","logoDisplay":"logoAndText","zones":{"left":[{"type":"builtin","id":"logo"}],"center":[{"type":"builtin","id":"search"}],"right":[{"type":"builtin","id":"boardEdit"},{"type":"builtin","id":"boardSettings"},{"type":"builtin","id":"user"}]}}' NOT NULL;
 --> statement-breakpoint
 INSERT INTO `serverSetting` (`setting_key`, `value`)
 VALUES ('branding', '{"json":{"appName":"Homarr","greeting":"","logoImageUrl":null,"faviconImageUrl":null,"primaryColor":"#fa5252","secondaryColor":"#fd7e14","lockPrimaryColor":false,"signInBackgroundImageUrl":null,"signInBackgroundOverlay":0.55,"authBranding":{"showAppName":true,"showLogo":true,"showGreeting":true},"defaultRadius":"md"}}')
diff --git a/packages/db/migrations/sqlite/meta/0046_snapshot.json b/packages/db/migrations/sqlite/meta/0046_snapshot.json
index bf89440f3..b7609b176 100644
--- a/packages/db/migrations/sqlite/meta/0046_snapshot.json
+++ b/packages/db/migrations/sqlite/meta/0046_snapshot.json
@@ -2551,7 +2551,7 @@
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "'{\"version\":3,\"visible\":true,\"searchDisplay\":\"input\",\"logoDisplay\":\"logo\",\"zones\":{\"left\":[{\"type\":\"builtin\",\"id\":\"logo\"}],\"center\":[{\"type\":\"builtin\",\"id\":\"search\"}],\"right\":[{\"type\":\"builtin\",\"id\":\"boardEdit\"},{\"type\":\"builtin\",\"id\":\"boardSettings\"},{\"type\":\"builtin\",\"id\":\"user\"}]}}'"
+          "default": "'{\"version\":3,\"visible\":true,\"searchDisplay\":\"input\",\"logoDisplay\":\"logoAndText\",\"zones\":{\"left\":[{\"type\":\"builtin\",\"id\":\"logo\"}],\"center\":[{\"type\":\"builtin\",\"id\":\"search\"}],\"right\":[{\"type\":\"builtin\",\"id\":\"boardEdit\"},{\"type\":\"builtin\",\"id\":\"boardSettings\"},{\"type\":\"builtin\",\"id\":\"user\"}]}}'"
         },
         "completed_manage_tour": {
           "name": "completed_manage_tour",
diff --git a/packages/validation/src/header-preferences.ts b/packages/validation/src/header-preferences.ts
index e5866a043..5b7abe1b6 100644
--- a/packages/validation/src/header-preferences.ts
+++ b/packages/validation/src/header-preferences.ts
@@ -104,7 +104,7 @@ export const headerPreferencesSchema = z
     version: z.literal(headerPreferencesVersion),
     visible: z.boolean(),
     searchDisplay: z.enum(headerSearchDisplayValues),
-    logoDisplay: z.enum(headerLogoDisplayValues).default("logo"),
+    logoDisplay: z.enum(headerLogoDisplayValues).default("logoAndText"),
     zones: headerZonesSchema,
   })
   .strict();
@@ -154,7 +154,7 @@ const migrateLegacyItems = (
   version: headerPreferencesVersion,
   visible,
   searchDisplay: "input",
-  logoDisplay: "logo",
+  logoDisplay: "logoAndText",
   zones: {
     left: zones.left.map(createBuiltinHeaderItem),
     center: zones.center.map(createBuiltinHeaderItem),
@@ -208,7 +208,7 @@ export const defaultHeaderPreferences = {
   version: headerPreferencesVersion,
   visible: true,
   searchDisplay: "input",
-  logoDisplay: "logo",
+  logoDisplay: "logoAndText",
   zones: {
     left: [createBuiltinHeaderItem("logo")],
     center: [createBuiltinHeaderItem("search")],