diff --git a/Tekst-API/openapi.json b/Tekst-API/openapi.json
index ea8cfadc..d81a0895 100644
--- a/Tekst-API/openapi.json
+++ b/Tekst-API/openapi.json
@@ -14782,12 +14782,6 @@
             "description": "Show location aliases in browse view",
             "default": true
           },
-          "browseBarUsesTextColor": {
-            "type": "boolean",
-            "title": "Browsebarusestextcolor",
-            "description": "Use current working text's accent color for browse toolbar",
-            "default": false
-          },
           "uiColor": {
             "type": "string",
             "format": "color",
@@ -15070,19 +15064,6 @@
             "description": "Show location aliases in browse view",
             "optionalNullable": false
           },
-          "browseBarUsesTextColor": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Browsebarusestextcolor",
-            "description": "Use current working text's accent color for browse toolbar",
-            "optionalNullable": false
-          },
           "uiColor": {
             "anyOf": [
               {
diff --git a/Tekst-API/tekst/models/platform.py b/Tekst-API/tekst/models/platform.py
index c92ae698..35143639 100644
--- a/Tekst-API/tekst/models/platform.py
+++ b/Tekst-API/tekst/models/platform.py
@@ -200,13 +200,6 @@ class PlatformState(ModelBase, ModelFactoryMixin):
         ),
     ] = True
 
-    browse_bar_uses_text_color: Annotated[
-        bool,
-        Field(
-            description="Use current working text's accent color for browse toolbar",
-        ),
-    ] = False
-
     ui_color: Annotated[
         Color,
         ColorSerializer,
diff --git a/Tekst-Web/i18n/ui/deDE.yml b/Tekst-Web/i18n/ui/deDE.yml
index df2d38ba..5fbb76f7 100644
--- a/Tekst-Web/i18n/ui/deDE.yml
+++ b/Tekst-Web/i18n/ui/deDE.yml
@@ -363,7 +363,6 @@ models:
     showResourceCategoryHeadings: Zeige Überschriften für Kategorien
     prioritizeBrowseLevelResources: Platziere Ressourcen der aktuellen Ebene vor anderen (innerhalb ihrer Kategorien)
     showLocationAliases: Zeige Belegstellen-Aliase
-    browseBarUsesTextColor: Färbe Toolbar der Lese-Ansicht in der Farbe des aktuellen Arbeitstextes
     denyResourceTypes: Erstellung dieser Ressourcentypen nur Administratoren erlauben
     fonts: Benutzer*innendefinierte Schritarten
     uiFont: UI-Schriftart
diff --git a/Tekst-Web/i18n/ui/enUS.yml b/Tekst-Web/i18n/ui/enUS.yml
index 8e9a791d..6080b21e 100644
--- a/Tekst-Web/i18n/ui/enUS.yml
+++ b/Tekst-Web/i18n/ui/enUS.yml
@@ -359,7 +359,6 @@ models:
     showResourceCategoryHeadings: Show category headings
     prioritizeBrowseLevelResources: Place resources of current browse level before others (inside their category)
     showLocationAliases: Show location aliases
-    browseBarUsesTextColor: Use current working text's accent color for browse toolbar
     denyResourceTypes: Allow creation of these resource types for administrators only
     fonts: Custom Fonts
     uiFont: User Interface Font
diff --git a/Tekst-Web/src/api/schema.d.ts b/Tekst-Web/src/api/schema.d.ts
index c66aebc5..7bf4ab2c 100644
--- a/Tekst-Web/src/api/schema.d.ts
+++ b/Tekst-Web/src/api/schema.d.ts
@@ -4809,12 +4809,6 @@ export interface components {
        * @default true
        */
       showLocationAliases: boolean;
-      /**
-       * Browsebarusestextcolor
-       * @description Use current working text's accent color for browse toolbar
-       * @default false
-       */
-      browseBarUsesTextColor: boolean;
       /**
        * Uicolor
        * Format: color
@@ -4934,11 +4928,6 @@ export interface components {
        * @description Show location aliases in browse view
        */
       showLocationAliases?: boolean;
-      /**
-       * Browsebarusestextcolor
-       * @description Use current working text's accent color for browse toolbar
-       */
-      browseBarUsesTextColor?: boolean;
       /**
        * Uicolor
        * @description Primary color used in for client UI
diff --git a/Tekst-Web/src/components/browse/BookmarksWidget.vue b/Tekst-Web/src/components/browse/BookmarksWidget.vue
index 28a7d9a5..2dadfb9d 100644
--- a/Tekst-Web/src/components/browse/BookmarksWidget.vue
+++ b/Tekst-Web/src/components/browse/BookmarksWidget.vue
@@ -15,6 +15,7 @@ import { useRouter } from 'vue-router';
 
 defineProps<{
   buttonSize?: 'small' | 'medium' | 'large';
+  color?: string;
 }>();
 
 const browse = useBrowseStore();
@@ -87,7 +88,7 @@ async function handleWidgetClick() {
 <template>
   <n-button
     quaternary
-    color="var(--base-color)"
+    :color="color"
     :size="buttonSize"
     :focusable="false"
     :title="$t('browse.bookmarks.bookmarks')"
diff --git a/Tekst-Web/src/components/browse/BrowseLocationControls.vue b/Tekst-Web/src/components/browse/BrowseLocationControls.vue
index 978515e2..c0736c56 100644
--- a/Tekst-Web/src/components/browse/BrowseLocationControls.vue
+++ b/Tekst-Web/src/components/browse/BrowseLocationControls.vue
@@ -14,6 +14,7 @@ import { ref } from 'vue';
 withDefaults(
   defineProps<{
     buttonSize?: 'small' | 'medium' | 'large';
+    color?: string;
   }>(),
   {
     buttonSize: 'large',
@@ -54,7 +55,7 @@ whenever(ArrowRight, () => {
   <n-flex justify="space-between" align="center" :wrap="false">
     <n-button
       quaternary
-      color="var(--base-color)"
+      :color="color"
       :focusable="false"
       :title="$t('browse.toolbar.tipPreviousLocation')"
       :size="buttonSize"
@@ -70,7 +71,7 @@ whenever(ArrowRight, () => {
     <n-badge value="!" :show="!browse.isOnDefaultLevel && !browse.loadingLocationData">
       <n-button
         quaternary
-        color="var(--base-color)"
+        :color="color"
         :title="
           $t('browse.toolbar.tipSelectLocation') +
           (!browse.isOnDefaultLevel ? ' (' + $t('browse.toolbar.tipNotOnDefaultLevel') + ')' : '')
@@ -86,11 +87,11 @@ whenever(ArrowRight, () => {
       </n-button>
     </n-badge>
 
-    <bookmarks-widget v-if="!!auth.user" :button-size="buttonSize" />
+    <bookmarks-widget v-if="!!auth.user" :button-size="buttonSize" :color="color" />
 
     <n-button
       quaternary
-      color="var(--base-color)"
+      :color="color"
       :focusable="false"
       :title="$t('browse.toolbar.tipNextLocation')"
       :size="buttonSize"
diff --git a/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue b/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue
index f4f040cf..ebc714d5 100644
--- a/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue
+++ b/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue
@@ -8,7 +8,7 @@ import {
   SkipNextIcon,
   SkipPreviousIcon,
 } from '@/icons';
-import { useBrowseStore, useSearchStore, useStateStore, useThemeStore } from '@/stores';
+import { useBrowseStore, useSearchStore, useThemeStore } from '@/stores';
 import { NBadge, NButton, NFlex, NIcon } from 'naive-ui';
 import { computed, onMounted } from 'vue';
 
@@ -22,17 +22,10 @@ withDefaults(
   }
 );
 
-const state = useStateStore();
 const browse = useBrowseStore();
 const search = useSearchStore();
 const theme = useThemeStore();
 
-const bgColor = computed(() =>
-  !!state.pf?.state.browseBarUsesTextColor
-    ? theme.getTextColors().fade4
-    : 'var(--primary-color-fade4)'
-);
-
 const resultNo = computed(
   () =>
     search.settingsGeneral.pgn.pgs * (search.settingsGeneral.pgn.pg - 1) +
@@ -44,6 +37,8 @@ const viewingSearchResult = computed(
   () => search.browseCurrHit?.id === browse.locationPathHead?.id
 );
 
+const toolbarTxtColor = computed(() => (theme.dark ? '#fff' : '#333'));
+
 async function skip(direction: 'previous' | 'next') {
   await search.browseSkipTo(direction);
   if (search.browseHitResourcesActive) {
@@ -83,12 +78,13 @@ onMounted(() => {
       align="center"
       :wrap="false"
       class="bsr-toolbar"
-      :style="{ backgroundColor: bgColor }"
+      :style="{ backgroundColor: theme.dark ? '#444' : '#c5c5c5' }"
     >
       <n-flex :wrap="false">
         <!-- skip to previous search result -->
         <n-button
           quaternary
+          :color="toolbarTxtColor"
           :size="buttonSize"
           :title="$t('search.results.browsePrev')"
           :focusable="false"
@@ -103,6 +99,7 @@ onMounted(() => {
         <!-- go to search results -->
         <n-button
           quaternary
+          :color="toolbarTxtColor"
           :size="buttonSize"
           :title="$t('search.results.heading')"
           :focusable="false"
@@ -117,6 +114,7 @@ onMounted(() => {
         <!-- skip to next search result -->
         <n-button
           quaternary
+          :color="toolbarTxtColor"
           :size="buttonSize"
           :title="$t('search.results.browseNext')"
           :focusable="false"
@@ -137,6 +135,7 @@ onMounted(() => {
         align="center"
         :wrap="false"
         class="bsr-toolbar-middle text-small"
+        :style="{ color: toolbarTxtColor }"
       >
         <n-flex
           v-if="!search.loading"
@@ -167,6 +166,7 @@ onMounted(() => {
           <n-button
             :quaternary="!search.browseHitResourcesActive"
             :tertiary="search.browseHitResourcesActive"
+            :color="toolbarTxtColor"
             :size="buttonSize"
             :title="$t('search.results.browseHitResourcesActive')"
             :focusable="false"
@@ -181,6 +181,7 @@ onMounted(() => {
         <!-- stop browsing search results -->
         <n-button
           quaternary
+          :color="toolbarTxtColor"
           :size="buttonSize"
           :title="$t('search.results.browseStop')"
           :focusable="false"
@@ -202,7 +203,7 @@ onMounted(() => {
 }
 
 .bsr-toolbar {
-  padding: var(--gap-sm);
+  padding: var(--gap-sm) var(--gap-md);
   border-bottom-left-radius: var(--border-radius);
   border-bottom-right-radius: var(--border-radius);
 }
diff --git a/Tekst-Web/src/components/browse/BrowseToolbar.vue b/Tekst-Web/src/components/browse/BrowseToolbar.vue
index b07175d9..ec5bd841 100644
--- a/Tekst-Web/src/components/browse/BrowseToolbar.vue
+++ b/Tekst-Web/src/components/browse/BrowseToolbar.vue
@@ -12,10 +12,11 @@ const browse = useBrowseStore();
 const search = useSearchStore();
 const theme = useThemeStore();
 
-const bgColor = computed(() =>
-  !!state.pf?.state.browseBarUsesTextColor ? theme.getTextColors().base : 'var(--primary-color)'
-);
 const affixRef = ref();
+const affixed = ref(false);
+
+const toolbarTxtColor = computed(() => (theme.dark ? '#fff' : '#333'));
+
 const resourcesCount = computed(
   () => browse.resourcesCategorized.map((c) => c.resources).flat().length
 );
@@ -34,7 +35,10 @@ onMounted(() => {
   nextTick(() => {
     if (affixRef.value) {
       new IntersectionObserver(
-        ([e]) => e.target.classList.toggle('affixed', e.intersectionRatio < 1),
+        ([e]) => {
+          affixed.value = e.intersectionRatio < 1;
+          e.target.classList.toggle('affixed', affixed.value);
+        },
         { threshold: [1] }
       ).observe(affixRef.value);
     }
@@ -57,22 +61,35 @@ const buttonSize = computed(() => (state.smallScreen ? 'small' : 'large'));
       justify="space-between"
       align="center"
       class="browse-toolbar"
-      :style="{ backgroundColor: bgColor }"
+      :style="{ backgroundColor: theme.dark ? '#555' : '#d5d5d5' }"
     >
-      <browse-location-controls :button-size="buttonSize" data-tour-key="browseNav" />
-
-      <div v-if="!state.smallScreen" class="browse-toolbar-middle browse-location-label text-small">
+      <browse-location-controls
+        :button-size="buttonSize"
+        :color="toolbarTxtColor"
+        data-tour-key="browseNav"
+      />
+
+      <div
+        v-if="!state.smallScreen"
+        class="browse-toolbar-middle browse-location-label"
+        :style="{ color: toolbarTxtColor }"
+        :title="affixed ? state.text?.title : undefined"
+      >
         <n-flex justify="center" align="center" :wrap="false">
-          <b style="text-align: center">{{ state.text?.title || '???' }}</b>
+          <div
+            class="text-color-indicator"
+            :style="{ backgroundColor: theme.getTextColors().base }"
+          ></div>
+          <span v-if="!affixed">{{ state.text?.title || '???' }}</span>
+          <span v-else><location-label /></span>
         </n-flex>
-        <div><location-label /></div>
       </div>
 
       <div class="browse-toolbar-end">
         <n-badge dot :offset="[-2, 5]" :show="browse.focusView">
           <n-button
             quaternary
-            color="var(--base-color)"
+            :color="toolbarTxtColor"
             :style="{
               backgroundColor: browse.focusView ? 'var(--base-color-translucent)' : undefined,
             }"
@@ -96,7 +113,7 @@ const buttonSize = computed(() => (state.smallScreen ? 'small' : 'large'));
         >
           <n-button
             quaternary
-            color="var(--base-color)"
+            :color="toolbarTxtColor"
             :size="buttonSize"
             :title="$t('browse.toolbar.tipOpenResourceList')"
             :focusable="false"
@@ -178,9 +195,10 @@ const buttonSize = computed(() => (state.smallScreen ? 'small' : 'large'));
   max-width: var(--max-app-width);
 }
 
-.browse-toolbar .browse-location-label {
-  visibility: hidden;
-  color: var(--base-color);
+.browse-toolbar .browse-location-label .text-color-indicator {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
 }
 
 .browse-toolbar-container.affixed .browse-location-label {
diff --git a/Tekst-Web/src/components/navigation/TextSelect.vue b/Tekst-Web/src/components/navigation/TextSelect.vue
index e0a5842f..029bf5c6 100644
--- a/Tekst-Web/src/components/navigation/TextSelect.vue
+++ b/Tekst-Web/src/components/navigation/TextSelect.vue
@@ -4,6 +4,7 @@ import TranslationDisplay from '@/components/generic/TranslationDisplay.vue';
 import TextSelectOption from '@/components/navigation/TextSelectOption.vue';
 import { useBrowseStore, useStateStore } from '@/stores';
 import { NFlex, NSelect, type SelectInst, type SelectOption } from 'naive-ui';
+import type { RenderLabel } from 'naive-ui/es/_internal/select-menu/src/interface';
 import { computed, h, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
@@ -14,21 +15,30 @@ const browse = useBrowseStore();
 const disabled = computed(() => !state.pf?.texts || state.pf.texts.length <= 1);
 const selectRef = ref<SelectInst>();
 
-const renderLabel: SelectOption['render'] = (info) => {
+const renderOptionLabel: SelectOption['render'] = (info) => {
   return h(TextSelectOption, {
     text: info.option.text as TextRead,
     locale: state.locale,
-    selected: info.option.value === state.text?.id,
+    selected: info.selected,
     onClick: () => handleSelect(info.option.text as TextRead),
   });
 };
 
+const renderSelectLabel: RenderLabel = (opt: SelectOption & { text: TextRead }, _selected) => {
+  return h(TextSelectOption, {
+    text: opt.text,
+    locale: state.locale,
+    singleLine: true,
+    onClick: () => handleSelect(opt.text as TextRead),
+  });
+};
+
 const options = computed<SelectOption[]>(
   () =>
     state.pf?.texts.map((t: TextRead) => ({
       label: t.title,
       value: t.id,
-      render: renderLabel,
+      render: renderOptionLabel,
       text: t,
     })) || []
 );
@@ -67,6 +77,7 @@ function handleSelect(text: TextRead) {
         :value="state.text?.id"
         size="large"
         :options="options"
+        :render-label="renderSelectLabel"
         :consistent-menu-width="false"
         :style="{
           width: state.smallScreen ? '100%' : 'unset',
@@ -90,19 +101,6 @@ function handleSelect(text: TextRead) {
   background-color: var(--main-bg-color);
 }
 
-.text-select-btn {
-  max-width: 100%;
-  justify-content: flex-start;
-}
-
-.text-select-btn.n-button--ghost:hover {
-  background-color: #ffffff1a;
-}
-
-.n-button :deep(.n-button__border) {
-  border: 1px solid var(--base-color-translucent);
-}
-
 .text-title {
   line-height: 150%;
   max-width: 100%;
@@ -114,14 +112,6 @@ function handleSelect(text: TextRead) {
   padding-bottom: 0.2em;
 }
 
-.text-info-btn {
-  opacity: 0.6;
-}
-
-.text-info-btn:hover {
-  opacity: 1;
-}
-
 .text-select-inner {
   padding: var(--gap-md) var(--gap-lg);
   max-width: var(--max-app-width);
diff --git a/Tekst-Web/src/components/navigation/TextSelectOption.vue b/Tekst-Web/src/components/navigation/TextSelectOption.vue
index 0bb1d468..0aeaf9d9 100644
--- a/Tekst-Web/src/components/navigation/TextSelectOption.vue
+++ b/Tekst-Web/src/components/navigation/TextSelectOption.vue
@@ -11,6 +11,7 @@ const props = defineProps<{
   text: TextRead;
   locale: string;
   selected?: boolean;
+  singleLine?: boolean;
 }>();
 
 const theme = useThemeStore();
@@ -20,45 +21,62 @@ const indicatorStyle = computed(() => ({
 </script>
 
 <template>
-  <n-flex align="stretch" class="text-select-option" :class="{ selected }">
-    <div class="text-select-option-indicator" :style="indicatorStyle"></div>
+  <n-flex
+    :align="singleLine ? 'center' : 'stretch'"
+    class="opt"
+    :class="{ selected, 'menu-opt': !singleLine }"
+  >
+    <div
+      class="opt-indicator"
+      :class="{ 'opt-indicator-single-line': singleLine }"
+      :style="indicatorStyle"
+    ></div>
     <div>
       <div>
         {{ text.title }}
       </div>
-      <div v-if="text.subtitle?.length" class="text-small translucent">
+      <div v-if="text.subtitle?.length && !singleLine" class="text-small translucent">
         <translation-display :value="text.subtitle" />
       </div>
-      <div v-if="!text.isActive" class="text-small translucent i">
+      <div v-if="!text.isActive && !singleLine" class="text-small translucent i">
         <n-icon :component="DisabledVisibleIcon" />
         {{ $t('models.text.isInactive') }}
       </div>
     </div>
-    <n-flex v-if="selected" justify="flex-end" align="center" style="flex-grow: 2">
+    <n-flex v-if="selected && !singleLine" justify="flex-end" align="center" style="flex-grow: 2">
       <n-icon :component="CheckIcon" />
     </n-flex>
   </n-flex>
 </template>
 
 <style scoped>
-.text-select-option {
-  padding: 4px 6px;
-  margin: 2px 6px;
+.opt {
   border-radius: 3px;
   cursor: pointer;
   transition: 0.2s;
 }
 
-.text-select-option.selected {
+.opt.selected {
   color: var(--primary-color);
 }
 
-.text-select-option:hover {
+.menu-opt {
+  padding: 4px 6px;
+  margin: 2px 6px;
+}
+
+.menu-opt:hover {
   background-color: #88888825;
 }
 
-.text-select-option-indicator {
+.opt-indicator {
   width: 12px;
   border-radius: 3px;
 }
+
+.opt-indicator-single-line {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+}
 </style>
diff --git a/Tekst-Web/src/views/ContentsView.vue b/Tekst-Web/src/views/ContentsView.vue
index 879bf69f..fd4613fb 100644
--- a/Tekst-Web/src/views/ContentsView.vue
+++ b/Tekst-Web/src/views/ContentsView.vue
@@ -94,6 +94,8 @@ const originalResourceTitle = computed(() =>
   )
 );
 
+const toolbarTxtColor = computed(() => (theme.dark ? '#fff' : '#333'));
+
 const locationPath = ref<LocationRead[]>();
 const location = computed<LocationRead | undefined>(
   () => locationPath.value?.[resource.value?.level ?? locationPath.value.length - 1]
@@ -448,16 +450,12 @@ whenever(ArrowRight, () => {
     bottom-gap
     wrap="wrap-reverse"
     class="toolbar"
-    :style="{
-      backgroundColor: !!state.pf?.state.browseBarUsesTextColor
-        ? theme.getTextColors().base
-        : 'var(--primary-color)',
-    }"
+    :style="{ backgroundColor: theme.dark ? '#555' : '#d5d5d5' }"
   >
     <template #start>
       <n-button
         quaternary
-        color="var(--base-color)"
+        :color="toolbarTxtColor"
         :title="$t('browse.toolbar.tipPreviousLocation')"
         :disabled="loading || !prevLocationId"
         :focusable="false"
@@ -469,7 +467,7 @@ whenever(ArrowRight, () => {
       </n-button>
       <n-button
         quaternary
-        color="var(--base-color)"
+        :color="toolbarTxtColor"
         :title="$t('browse.toolbar.tipSelectLocation')"
         :disabled="loading"
         :focusable="false"
@@ -481,7 +479,7 @@ whenever(ArrowRight, () => {
       </n-button>
       <n-button
         quaternary
-        color="var(--base-color)"
+        :color="toolbarTxtColor"
         :title="$t('browse.toolbar.tipNextLocation')"
         :disabled="loading || !nextLocationId"
         :focusable="false"
@@ -501,7 +499,7 @@ whenever(ArrowRight, () => {
     >
       <n-button
         quaternary
-        color="var(--base-color)"
+        :color="toolbarTxtColor"
         :disabled="loading || !compareResourceOptions.length"
         :focusable="false"
         :title="$t('contents.tipBtnCompare')"
diff --git a/Tekst-Web/src/views/admin/AdminSystemSettingsView.vue b/Tekst-Web/src/views/admin/AdminSystemSettingsView.vue
index d0c2cd4a..aba543e5 100644
--- a/Tekst-Web/src/views/admin/AdminSystemSettingsView.vue
+++ b/Tekst-Web/src/views/admin/AdminSystemSettingsView.vue
@@ -282,13 +282,6 @@ watch(
                 :label="$t('models.platformSettings.showLocationAliases')"
               />
             </n-form-item>
-            <!-- USE CURRENT WORKING TEXT'S ACCENT COLOR FOR BROWSE TOOLBAR -->
-            <n-form-item :show-label="false" :show-feedback="false">
-              <labeled-switch
-                v-model="formModel.browseBarUsesTextColor"
-                :label="$t('models.platformSettings.browseBarUsesTextColor')"
-              />
-            </n-form-item>
           </form-section>
         </n-tab-pane>