diff --git a/assets/js/src/core/modules/search/modal/search-modal.tsx b/assets/js/src/core/modules/search/modal/search-modal.tsx
index 9949a7f181..50b69f91f3 100644
--- a/assets/js/src/core/modules/search/modal/search-modal.tsx
+++ b/assets/js/src/core/modules/search/modal/search-modal.tsx
@@ -62,16 +62,22 @@ export const SearchModal = (): React.JSX.Element => {
           onCancel={ () => { close() } }
           open={ isOpen }
           size={ 'XL' }
+          title={ t('search-modal.title') }
         >
-          <Tabs
-            activeKey={ activeKey }
-            data-testid="search-modal-tabs"
-            items={ tabItems }
-            noTabBarMargin
-            onChange={ (key) => {
-              setActiveKey(key)
-            } }
-          />
+          <div style={ { display: 'flex', flexDirection: 'column', height: 500 } }>
+            <Tabs
+              activeKey={ activeKey }
+              data-testid="search-modal-tabs"
+              fullHeight
+              items={ tabItems }
+              noPadding
+              noTabBarMargin
+              onChange={ (key) => {
+                setActiveKey(key)
+              } }
+              style={ { flex: 1, minHeight: 0 } }
+            />
+          </div>
         </Modal>
       )}
     </>
diff --git a/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/toolbar/toolbar.tsx b/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/toolbar/toolbar.tsx
index cd56c3ea7d..4ebca95b4e 100644
--- a/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/toolbar/toolbar.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/toolbar/toolbar.tsx
@@ -19,7 +19,6 @@ import { Flex } from '@Pimcore/components/flex/flex'
 export const Toolbar = (): React.JSX.Element => {
   return (
     <BaseToolbar
-      borderStyle='default'
       padding={ { right: 'none', left: 'none' } }
       theme='secondary'
     >
diff --git a/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/top-bar/top-bar.tsx b/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/top-bar/top-bar.tsx
index f034df0320..7846f4c724 100644
--- a/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/top-bar/top-bar.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/asset/listing/view/top-bar/top-bar.tsx
@@ -17,14 +17,13 @@ import React from 'react'
 export const TopBar = (): React.JSX.Element => {
   return (
     <Toolbar
-      borderStyle='default'
       padding={ { left: 'none', right: 'none' } }
-      position='top'
+      position='none'
       theme='secondary'
     >
       <Flex
         className='w-full'
-        gap={ 'small' }
+        gap={ 'extra-small' }
       >
         <ProvidedTypeSelect />
         <SearchTermFilter />
diff --git a/assets/js/src/core/modules/search/modal/tabs/document/listing/view/toolbar/toolbar.tsx b/assets/js/src/core/modules/search/modal/tabs/document/listing/view/toolbar/toolbar.tsx
index cd56c3ea7d..4ebca95b4e 100644
--- a/assets/js/src/core/modules/search/modal/tabs/document/listing/view/toolbar/toolbar.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/document/listing/view/toolbar/toolbar.tsx
@@ -19,7 +19,6 @@ import { Flex } from '@Pimcore/components/flex/flex'
 export const Toolbar = (): React.JSX.Element => {
   return (
     <BaseToolbar
-      borderStyle='default'
       padding={ { right: 'none', left: 'none' } }
       theme='secondary'
     >
diff --git a/assets/js/src/core/modules/search/modal/tabs/document/listing/view/top-bar/top-bar.tsx b/assets/js/src/core/modules/search/modal/tabs/document/listing/view/top-bar/top-bar.tsx
index f034df0320..7846f4c724 100644
--- a/assets/js/src/core/modules/search/modal/tabs/document/listing/view/top-bar/top-bar.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/document/listing/view/top-bar/top-bar.tsx
@@ -17,14 +17,13 @@ import React from 'react'
 export const TopBar = (): React.JSX.Element => {
   return (
     <Toolbar
-      borderStyle='default'
       padding={ { left: 'none', right: 'none' } }
-      position='top'
+      position='none'
       theme='secondary'
     >
       <Flex
         className='w-full'
-        gap={ 'small' }
+        gap={ 'extra-small' }
       >
         <ProvidedTypeSelect />
         <SearchTermFilter />
diff --git a/assets/js/src/core/modules/search/modal/tabs/general/search-result/search-result.tsx b/assets/js/src/core/modules/search/modal/tabs/general/search-result/search-result.tsx
index 988819c6e7..c971b01032 100644
--- a/assets/js/src/core/modules/search/modal/tabs/general/search-result/search-result.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/general/search-result/search-result.tsx
@@ -70,11 +70,10 @@ export const SearchResult = (): React.JSX.Element => {
     }
 
     return (
-      <>
-        <div />
-
-        <SplitLayout
-          leftItem={
+      <div style={ { display: 'flex', flexDirection: 'column', height: '100%' } }>
+        <div style={ { flex: 1, overflow: 'hidden', minHeight: 0 } }>
+          <SplitLayout
+            leftItem={
             {
               size: 750,
               children: (
@@ -82,7 +81,7 @@ export const SearchResult = (): React.JSX.Element => {
                   overflow={ { x: 'hidden', y: 'auto' } }
                   padded
                   padding={ { left: 'none', right: 'none', y: 'none' } }
-                  style={ { height: 400 } }
+                  style={ { height: '100%' } }
                 >
                   <Flex
                     className='w-full h-full'
@@ -116,7 +115,7 @@ export const SearchResult = (): React.JSX.Element => {
             }
           }
 
-          rightItem={
+            rightItem={
             {
               size: 250,
               minSize: 250,
@@ -127,10 +126,14 @@ export const SearchResult = (): React.JSX.Element => {
             }
           }
 
-          withDivider
-        />
+            withDivider
+          />
+        </div>
 
-        <Toolbar theme='secondary'>
+        <Toolbar
+          padding={ { left: 'none', right: 'none' } }
+          theme='secondary'
+        >
           <Pagination
             onChange={ onChange }
             pageSizeOptions={ [10, 20, 50, 100] }
@@ -139,7 +142,7 @@ export const SearchResult = (): React.JSX.Element => {
             total={ data?.totalItems ?? 0 }
           />
         </Toolbar>
-      </>
+      </div>
     )
   }, [data, selectedItem, isLoading])
 }
diff --git a/assets/js/src/core/modules/search/modal/tabs/object/listing/view/toolbar/toolbar.tsx b/assets/js/src/core/modules/search/modal/tabs/object/listing/view/toolbar/toolbar.tsx
index 4dc6fcaec9..08c8a9ebc1 100644
--- a/assets/js/src/core/modules/search/modal/tabs/object/listing/view/toolbar/toolbar.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/object/listing/view/toolbar/toolbar.tsx
@@ -20,7 +20,6 @@ import { LanguageSelectionWithProvider } from '@Pimcore/components/language-sele
 export const Toolbar = (): React.JSX.Element => {
   return (
     <BaseToolbar
-      borderStyle='default'
       padding={ { right: 'none', left: 'none' } }
       theme='secondary'
     >
diff --git a/assets/js/src/core/modules/search/modal/tabs/object/listing/view/top-bar/top-bar.tsx b/assets/js/src/core/modules/search/modal/tabs/object/listing/view/top-bar/top-bar.tsx
index b85a0b0ff3..f6b0c526a1 100644
--- a/assets/js/src/core/modules/search/modal/tabs/object/listing/view/top-bar/top-bar.tsx
+++ b/assets/js/src/core/modules/search/modal/tabs/object/listing/view/top-bar/top-bar.tsx
@@ -12,20 +12,19 @@ import { Toolbar } from '@Pimcore/components/toolbar/toolbar'
 import { ClassDefinitionSelect } from '@Pimcore/modules/data-object/listing/decorator/class-definition-selection/components/class-definition-select/class-definition-select'
 import { ProvidedTypeSelect } from '@Pimcore/modules/element/components/type-select/provided-type-select'
 import { SearchTermFilter } from '@Pimcore/modules/element/listing/decorators/general-filters/view-layer/components/search/search-term-filter'
-import { Flex } from 'antd'
+import { Flex } from '@Pimcore/components/flex/flex'
 import React from 'react'
 
 export const TopBar = (): React.JSX.Element => {
   return (
     <Toolbar
-      borderStyle='default'
       padding={ { left: 'none', right: 'none' } }
-      position='top'
+      position='none'
       theme='secondary'
     >
       <Flex
         className='w-full'
-        gap={ 'small' }
+        gap={ 'extra-small' }
       >
         <ProvidedTypeSelect />
         <ClassDefinitionSelect nullable />
diff --git a/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.styles.ts b/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.styles.ts
index 1dba757ac5..f8afbd757b 100644
--- a/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.styles.ts
+++ b/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.styles.ts
@@ -12,9 +12,8 @@ import { createStyles } from '@Pimcore/modules/ant-design/styles/create-styles'
 
 export const useStyles = createStyles(({ css, token }) => {
   return {
-    // Purple line under the search bar, mirroring the paging toolbar's top border.
     topBar: css`
-      border-bottom: 1px solid ${token.colorPrimaryBorder};
+      border-bottom: 1px solid ${token.colorBorderTertiary};
     `
   }
 })
diff --git a/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.tsx b/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.tsx
index 0b53f6f28d..17c136cc4b 100644
--- a/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.tsx
+++ b/assets/js/src/core/modules/search/saved-search/components/saved-searches-tab/saved-searches-tab.tsx
@@ -94,11 +94,13 @@ export const SavedSearchesTab = (): React.JSX.Element => {
       .finally(() => { setDeletingId(undefined) })
   }
 
-  const tableItems: SavedSearchRow[] = (data?.items ?? []).map((item) => ({
-    ...item,
-    ownership: item.owner ? t('saved-search.ownership.own') : t('saved-search.ownership.shared'),
-    modificationDateLabel: formatDateTime({ timestamp: item.modificationDate, dateStyle: 'short', timeStyle: 'short' })
-  }))
+  const tableItems: SavedSearchRow[] = [
+    ...(data?.items ?? []).map((item) => ({
+      ...item,
+      ownership: item.owner ? t('saved-search.ownership.own') : t('saved-search.ownership.shared'),
+      modificationDateLabel: formatDateTime({ timestamp: item.modificationDate, dateStyle: 'short', timeStyle: 'short' })
+    }))
+  ]
 
   const columnHelper = createColumnHelper<SavedSearchRow>()
   const columns = [
@@ -137,7 +139,7 @@ export const SavedSearchesTab = (): React.JSX.Element => {
         <Flex align='center'>
           <IconButton
             data-testid='saved-search-open-button'
-            icon={ { value: 'folder' } }
+            icon={ { value: 'open-folder' } }
             loading={ openingId === row.original.id }
             onClick={ () => { onOpen(row.original.id) } }
             tooltip={ { title: t('saved-search.open') } }
@@ -167,24 +169,27 @@ export const SavedSearchesTab = (): React.JSX.Element => {
   ]
 
   return (
-    <ContentLayout
-      renderToolbar={
-        <Toolbar
-          borderStyle='primary'
-          margin={ { top: 'small' } }
-          padding={ { x: 'small', y: 'extra-small' } }
-          theme='secondary'
-        >
-          <Flex align='center'>
-            <IconButton
-              data-testid='saved-search-refresh-button'
-              disabled={ isFetching }
-              icon={ { value: 'refresh' } }
-              onClick={ () => { void refetch() } }
-              tooltip={ { title: t('refresh') } }
-              type='link'
-            />
-            {total > 0 && (
+    <div style={ { position: 'absolute', top: 0, right: 0, bottom: 0, left: 0 } }>
+      <ContentLayout
+        renderToolbar={
+          <Toolbar
+            padding={ { left: 'none', right: 'none' } }
+            position={ total > 0 ? 'none' : 'bottom' }
+            theme='secondary'
+          >
+            <Flex
+              align='center'
+              gap='extra-small'
+            >
+              <IconButton
+                data-testid='saved-search-refresh-button'
+                disabled={ isFetching }
+                icon={ { value: 'refresh' } }
+                onClick={ () => { void refetch() } }
+                tooltip={ { title: t('refresh') } }
+                type='link'
+              />
+              {total > 0 && (
               <>
                 <Divider
                   size='small'
@@ -202,52 +207,53 @@ export const SavedSearchesTab = (): React.JSX.Element => {
                   total={ total }
                 />
               </>
-            )}
-          </Flex>
-        </Toolbar>
+              )}
+            </Flex>
+          </Toolbar>
       }
-      renderTopBar={
-        <Box
-          className={ styles.topBar }
-          margin={ { bottom: 'small' } }
-          padding={ { x: 'small', y: 'extra-small' } }
-        >
-          <SearchInput
-            maxWidth='100%'
-            onSearch={ (value) => {
-              setCurrentPage(1)
-              setSearchTerm(value)
-            } }
-            placeholder={ t('component.search.pleaceholder') }
-          />
-        </Box>
+        renderTopBar={
+          <Box
+            className={ (data?.totalItems ?? 0) === 0 ? styles.topBar : undefined }
+            margin={ { bottom: 'small' } }
+            padding={ { y: 'extra-small' } }
+          >
+            <SearchInput
+              maxWidth='100%'
+              onSearch={ (value) => {
+                setCurrentPage(1)
+                setSearchTerm(value)
+              } }
+              placeholder={ t('component.search.pleaceholder') }
+            />
+          </Box>
       }
-    >
-      <Content
-        margin={ { x: 'extra-small', y: 'none' } }
-        none={ !isFetching && isEmpty(data?.items) }
       >
-        <Box margin={ { x: 'extra-small', y: 'none' } }>
-          <Grid
-            autoWidth
-            columns={ columns }
-            data={ tableItems }
-            enableSorting
-            isLoading={ isFetching }
-            manualSorting
-            onSortingChange={ (nextSorting) => {
-              setSorting(nextSorting)
-              setCurrentPage(1)
-            } }
-            resizable
+        <Content
+          margin={ { x: 'extra-small', y: 'none' } }
+          none={ !isFetching && isEmpty(data?.items) }
+        >
+          <Box margin={ { x: 'extra-small', y: 'none' } }>
+            <Grid
+              autoWidth
+              columns={ columns }
+              data={ tableItems }
+              enableSorting
+              isLoading={ isFetching }
+              manualSorting
+              onSortingChange={ (nextSorting) => {
+                setSorting(nextSorting)
+                setCurrentPage(1)
+              } }
+              resizable
             // During loading the Grid renders placeholder rows without an id; return undefined for
             // those so it falls back to unique index ids (a constant id collides → phantom skeleton
             // rows linger after the data loads).
-            setRowId={ (row) => isUndefined(row.id) ? (undefined as unknown as string) : String(row.id) }
-            sorting={ sorting }
-          />
-        </Box>
-      </Content>
-    </ContentLayout>
+              setRowId={ (row) => isUndefined(row.id) ? (undefined as unknown as string) : String(row.id) }
+              sorting={ sorting }
+            />
+          </Box>
+        </Content>
+      </ContentLayout>
+    </div>
   )
 }
diff --git a/build-dist/build-d723cc4c5b90.zip b/build-dist/build-06032f25d658.zip
similarity index 89%
rename from build-dist/build-d723cc4c5b90.zip
rename to build-dist/build-06032f25d658.zip
index db08b67a3a..28fae5328b 100644
Binary files a/build-dist/build-d723cc4c5b90.zip and b/build-dist/build-06032f25d658.zip differ
diff --git a/translations/studio.de.yaml b/translations/studio.de.yaml
index c04b16b547..a5b361bd77 100644
--- a/translations/studio.de.yaml
+++ b/translations/studio.de.yaml
@@ -1273,6 +1273,8 @@ image-gallery.clear-image-selection: Bildauswahl leeren
 image-gallery.delete-frame: Rahmen löschen
 text: Text
 video: Video
+object: Objekt
+variant: Variante
 processing: Verarbeitung
 upload: Hochladen
 close: Schließen
diff --git a/translations/studio.en.yaml b/translations/studio.en.yaml
index c13f86cabb..5b12548915 100644
--- a/translations/studio.en.yaml
+++ b/translations/studio.en.yaml
@@ -1283,6 +1283,8 @@ image-gallery.clear-image-selection: Clear Image Selection
 image-gallery.delete-frame: Delete Frame
 text: Text
 video: Video
+object: Object
+variant: Variant
 processing: Processing
 upload: Upload
 close: Close
@@ -1371,6 +1373,7 @@ key-bindings.searchAsset: Search Asset
 key-bindings.searchObject: Search Object
 key-bindings.searchAndReplaceAssignments: Search and Replace Assignments
 key-bindings.quickSearch: Quick Search
+search-modal.title: Quick Search
 key-bindings.system: System
 key-bindings.showMetaInfo: Show Meta Info
 key-bindings.showElementHistory: Show Element History
@@ -2815,7 +2818,7 @@ saved-search.delete-search: Delete search
 saved-search.save-as-new: Save as new search
 saved-search.create-menu-shortcut: Create shortcut in menu
 saved-search.save.success: Saved search created
-saved-search.saved-searches: Saved searches
+saved-search.saved-searches: Saved Searches
 saved-search.ownership: Ownership
 saved-search.ownership.own: Own
 saved-search.ownership.shared: Shared with me
diff --git a/translations/studio.es.yaml b/translations/studio.es.yaml
index 0cca7210a0..c7454f46a3 100644
--- a/translations/studio.es.yaml
+++ b/translations/studio.es.yaml
@@ -1273,6 +1273,8 @@ image-gallery.clear-image-selection: Borrar selección de imagen
 image-gallery.delete-frame: Eliminar marco
 text: Texto
 video: Vídeo
+object: Objeto
+variant: Variante
 processing: Procesando
 upload: Subir
 close: Cerrar
diff --git a/translations/studio.fr.yaml b/translations/studio.fr.yaml
index 67840a35b1..c14279e2a3 100644
--- a/translations/studio.fr.yaml
+++ b/translations/studio.fr.yaml
@@ -1273,6 +1273,8 @@ image-gallery.clear-image-selection: Effacer la sélection d'image
 image-gallery.delete-frame: Supprimer le cadre
 text: Texte
 video: Vidéo
+object: Objet
+variant: Variante
 processing: Traitement
 upload: Téléverser
 close: Fermer
diff --git a/translations/studio.it.yaml b/translations/studio.it.yaml
index cd7f8001a1..fedd03946a 100644
--- a/translations/studio.it.yaml
+++ b/translations/studio.it.yaml
@@ -1273,6 +1273,8 @@ image-gallery.clear-image-selection: Cancella selezione immagine
 image-gallery.delete-frame: Elimina cornice
 text: Testo
 video: Video
+object: Oggetto
+variant: Variante
 processing: Elaborazione
 upload: Carica
 close: Chiudi
diff --git a/translations/studio.no.yaml b/translations/studio.no.yaml
index 112d417ba7..687693d961 100644
--- a/translations/studio.no.yaml
+++ b/translations/studio.no.yaml
@@ -1273,6 +1273,8 @@ image-gallery.clear-image-selection: Fjern bildevalg
 image-gallery.delete-frame: Slett ramme
 text: Tekst
 video: Video
+object: Objekt
+variant: Variant
 processing: Behandler
 upload: Last opp
 close: Lukk
diff --git a/translations/studio.sv.yaml b/translations/studio.sv.yaml
index 41a21ff2c5..95fed5bfe0 100644
--- a/translations/studio.sv.yaml
+++ b/translations/studio.sv.yaml
@@ -1273,6 +1273,8 @@ image-gallery.clear-image-selection: Rensa bildval
 image-gallery.delete-frame: Ta bort ram
 text: Text
 video: Video
+object: Objekt
+variant: Variant
 processing: Bearbetar
 upload: Ladda upp
 close: Stäng