diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchCurrentDirItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchCurrentDirItemViewHolder.kt
index d34f33c80b08..d4bc6d68114a 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchCurrentDirItemViewHolder.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchCurrentDirItemViewHolder.kt
@@ -10,13 +10,11 @@ package com.owncloud.android.ui.adapter
 import android.content.Context
 import android.view.View
 import com.afollestad.sectionedrecyclerview.SectionedViewHolder
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.User
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.databinding.UnifiedSearchCurrentDirectoryItemBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.ui.interfaces.UnifiedSearchCurrentDirItemAction
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.FileStorageUtils
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt
index e70cc9a97b37..36b0a01e6cea 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt
@@ -21,6 +21,6 @@ class UnifiedSearchHeaderViewHolder(
 
     fun bind(section: UnifiedSearchSection) {
         binding.title.text = section.name
-        viewThemeUtils.platform.colorPrimaryTextViewElement(binding.title)
+        viewThemeUtils.platform.colorTextView(binding.title)
     }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt
index 174fdeff666e..97c32785c018 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt
@@ -9,6 +9,7 @@ package com.owncloud.android.ui.adapter
 
 import android.content.Context
 import android.view.View
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.widget.ImageViewCompat
 import com.afollestad.sectionedrecyclerview.SectionedViewHolder
@@ -57,8 +58,8 @@ class UnifiedSearchItemViewHolder(
     private val calendarEventManager = CalendarEventManager(context)
 
     fun bind(entry: SearchResultEntry) {
-        binding.title.text = entry.title
-        bindSubline(entry)
+        bindTextView(binding.title, entry.title)
+        bindTextView(binding.subline, entry.subline)
         bindLocalFileIndicator(entry)
 
         val entryType = entry.getType()
@@ -69,16 +70,12 @@ class UnifiedSearchItemViewHolder(
         }
     }
 
-    private fun bindSubline(entry: SearchResultEntry) {
-        if (entry.subline.isNotBlank()) {
-            binding.subline.visibility = View.VISIBLE
-            binding.subline.text = entry.subline
+    private fun bindTextView(view: TextView, text: String?) {
+        if (text.isNullOrEmpty()) {
+            view.visibility = View.GONE
         } else {
-            binding.subline.visibility = View.GONE
-
-            val paddingInDp = context.resources.getDimension(R.dimen.standard_padding)
-            val paddingInPx = DisplayUtils.convertDpToPixel(paddingInDp, context)
-            binding.titleContainer.setPadding(0, paddingInPx, 0, 0)
+            view.visibility = View.VISIBLE
+            view.text = text
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt
index 90525138b29d..77cad5160a50 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt
@@ -62,7 +62,7 @@ class UnifiedSearchListAdapter(
     init {
         setHasStableIds(true)
 
-        // initialise thumbnails cache on background thread
+        // initialize thumbnails cache on background thread
         ThumbnailsCacheManager.initDiskCacheAsync()
     }
 
diff --git a/app/src/main/res/layout/unified_search_current_directory_item.xml b/app/src/main/res/layout/unified_search_current_directory_item.xml
index e05ff86912dd..5b5c8d6e6533 100644
--- a/app/src/main/res/layout/unified_search_current_directory_item.xml
+++ b/app/src/main/res/layout/unified_search_current_directory_item.xml
@@ -5,44 +5,46 @@
   ~ SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
   ~ SPDX-License-Identifier: AGPL-3.0-or-later
   -->
-<androidx.constraintlayout.widget.ConstraintLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/unified_search_current_dir_item_layout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="@dimen/standard_list_item_size"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <FrameLayout
+        android:id="@+id/thumbnail_layout"
+        android:layout_width="@dimen/standard_list_item_size"
+        android:layout_height="@dimen/standard_list_item_size">
 
-    <ImageView
-        android:id="@+id/thumbnail"
-        android:layout_marginStart="@dimen/standard_margin"
-        android:layout_width="@dimen/file_icon_size"
-        android:layout_height="@dimen/file_icon_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:contentDescription="@null"
-        android:src="@drawable/folder" />
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="center"
+            android:contentDescription="@null"
+            android:src="@drawable/folder" />
 
-    <com.elyeproj.loaderviewlibrary.LoaderImageView
-        android:id="@+id/thumbnail_shimmer"
-        android:layout_marginStart="@dimen/standard_margin"
-        android:layout_width="@dimen/file_icon_size"
-        android:layout_height="@dimen/file_icon_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:visibility="gone"
-        app:corners="8" />
+        <com.elyeproj.loaderviewlibrary.LoaderImageView
+            android:id="@+id/thumbnail_shimmer"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            app:corners="8" />
+
+    </FrameLayout>
 
     <LinearLayout
+        android:id="@+id/titleContainer"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/standard_margin"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/more"
-        app:layout_constraintStart_toEndOf="@+id/thumbnail"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/filename"
@@ -66,19 +68,15 @@
 
     </LinearLayout>
 
-    <ImageButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/more"
-        android:layout_marginEnd="@dimen/drawer_content_horizontal_padding"
-        android:layout_width="wrap_content"
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="@dimen/minimum_size_for_touchable_area"
         android:layout_height="match_parent"
-        android:clickable="true"
+        android:layout_gravity="center"
         android:contentDescription="@string/overflow_menu"
-        android:focusable="true"
-        android:minHeight="@dimen/min_list_item_size"
-        android:src="@drawable/ic_dots_vertical"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:icon="@drawable/ic_dots_vertical"
+        app:iconGravity="textStart"
+        app:iconTint="@color/secondary_text_color" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/unified_search_footer.xml b/app/src/main/res/layout/unified_search_footer.xml
index f4a96023d104..40de654999bb 100755
--- a/app/src/main/res/layout/unified_search_footer.xml
+++ b/app/src/main/res/layout/unified_search_footer.xml
@@ -2,31 +2,15 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
-  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/unified_search_footer_layout"
     android:layout_width="match_parent"
     android:layout_height="@dimen/min_list_item_size"
-    android:baselineAligned="false"
-    android:orientation="horizontal">
-
-
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="@dimen/standard_list_item_size"
-        android:layout_marginStart="@dimen/standard_list_item_size"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/standard_quarter_padding"
-        android:paddingEnd="0dp"
-        android:text="@string/load_more_results"
-        android:textColor="@color/secondary_text_color">
-
-    </TextView>
-</LinearLayout>
-
+    android:gravity="center_vertical"
+    android:paddingStart="@dimen/standard_list_item_size"
+    android:paddingEnd="@dimen/standard_quarter_padding"
+    android:text="@string/load_more_results"
+    android:textColor="@color/secondary_text_color" />
diff --git a/app/src/main/res/layout/unified_search_header.xml b/app/src/main/res/layout/unified_search_header.xml
index f37cd7c84961..0f3c4aba0268 100755
--- a/app/src/main/res/layout/unified_search_header.xml
+++ b/app/src/main/res/layout/unified_search_header.xml
@@ -2,26 +2,17 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
-  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
-  ~ SPDX-FileCopyrightText: 2018 Nextcloud GmbH
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ListItemLayout"
+    android:id="@+id/title"
+    style="@style/TextAppearance.Material3.HeadlineSmall"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.AppCompat.Body2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="middle"
-        android:paddingHorizontal="@dimen/standard_padding"
-        android:paddingVertical="@dimen/standard_padding"
-        android:textColor="@color/color_accent"
-        tools:text="@string/placeholder_files" />
-</RelativeLayout>
+    android:ellipsize="middle"
+    android:paddingHorizontal="@dimen/standard_padding"
+    android:paddingVertical="@dimen/standard_padding"
+    android:textColor="@color/color_accent"
+    tools:text="@string/placeholder_files" />
diff --git a/app/src/main/res/layout/unified_search_item.xml b/app/src/main/res/layout/unified_search_item.xml
index 515f88bcf270..74b89d93fc6d 100755
--- a/app/src/main/res/layout/unified_search_item.xml
+++ b/app/src/main/res/layout/unified_search_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
   ~ Nextcloud - Android Client
   ~
   ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
@@ -13,84 +12,68 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/standard_list_item_size"
     android:baselineAligned="false"
-    android:paddingStart="0dp"
-    android:paddingEnd="@dimen/standard_padding"
+    android:gravity="center_vertical"
     android:orientation="horizontal">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <FrameLayout
+        android:id="@+id/thumbnail_layout"
         android:layout_width="@dimen/standard_list_item_size"
-        android:layout_height="@dimen/standard_list_item_size"
-        android:layout_marginStart="@dimen/zero"
-        android:layout_marginEnd="@dimen/standard_quarter_padding">
+        android:layout_height="@dimen/standard_list_item_size">
 
-        <FrameLayout
-            android:id="@+id/thumbnail_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/thumbnail"
-                android:layout_width="@dimen/file_icon_size"
-                android:layout_height="@dimen/file_icon_size"
-                android:contentDescription="@null"
-                android:src="@drawable/ic_find_in_page" />
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="center"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_find_in_page" />
 
-            <ImageView
-                android:id="@+id/thumbnail_overlay_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                app:tint="@color/text_color_inverse"
-                tools:visibility="visible"
-                android:padding="@dimen/standard_quarter_padding"
-                android:src="@drawable/ic_lock"
-                android:contentDescription="@null" />
+        <ImageView
+            android:id="@+id/thumbnail_overlay_icon"
+            android:layout_width="@dimen/iconized_single_line_item_icon_size"
+            android:layout_height="@dimen/iconized_single_line_item_icon_size"
+            android:layout_gravity="center"
+            android:contentDescription="@null"
+            android:padding="@dimen/standard_quarter_padding"
+            android:src="@drawable/ic_lock"
+            android:visibility="gone"
+            app:tint="@color/text_color_inverse"
+            tools:visibility="visible" />
 
-            <com.elyeproj.loaderviewlibrary.LoaderImageView
-                android:id="@+id/thumbnail_shimmer"
-                android:layout_width="@dimen/file_icon_size"
-                android:layout_height="@dimen/file_icon_size"
-                android:visibility="gone"
-                app:corners="8" />
-        </FrameLayout>
+        <com.elyeproj.loaderviewlibrary.LoaderImageView
+            android:id="@+id/thumbnail_shimmer"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            app:corners="8" />
 
         <ImageView
             android:id="@+id/localFileIndicator"
             android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
             android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
+            android:layout_gravity="bottom|end"
             android:contentDescription="@string/downloader_download_succeeded_ticker"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_synced"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/thumbnail_layout"
-            app:layout_constraintEnd_toEndOf="@+id/thumbnail_layout"
-            app:layout_constraintStart_toEndOf="@+id/thumbnail_layout"
-            app:layout_constraintTop_toBottomOf="@+id/thumbnail_layout" />
+            android:visibility="gone" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
 
     <LinearLayout
         android:id="@+id/titleContainer"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:gravity="top"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/standard_padding">
+        android:gravity="center_vertical"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:text=""
             android:textColor="@color/text_color"
             android:textSize="@dimen/two_line_primary_text_size"
             tools:text="@string/placeholder_filename" />
@@ -101,25 +84,23 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:visibility="gone"
-            tools:visibility="visible"
             android:textColor="@color/list_item_lastmod_and_filesize_text"
             android:textSize="@dimen/two_line_secondary_text_size"
-            tools:text="@string/placeholder_in_folder" />
+            android:visibility="gone"
+            tools:text="@string/placeholder_in_folder"
+            tools:visibility="visible" />
 
     </LinearLayout>
 
-    <ImageButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/more"
-        android:visibility="gone"
-        android:background="@color/transparent"
-        app:srcCompat="@drawable/ic_dots_vertical"
-        app:tint="@color/standard_grey"
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
         android:contentDescription="@string/overflow_menu"
-        tools:visibility="visible" />
+        app:icon="@drawable/ic_dots_vertical"
+        app:iconGravity="textStart"
+        app:iconTint="@color/secondary_text_color" />
 
 </LinearLayout>
-