diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 7519393454..ee3f79d921 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -375,7 +375,7 @@
     <dimen name="taskbar_home_button_left_margin_kids">48dp</dimen>
     <dimen name="taskbar_icon_size_kids">32dp</dimen>
     <dimen name="taskbar_all_apps_search_button_translation_x_offset">6dp</dimen>
-    <dimen name="taskbar_all_apps_search_button_translation_x_offset_for_expressive_theme">5.5dp</dimen>
+    <dimen name="taskbar_all_apps_search_button_translation_x_offset_for_expressive_theme">0dp</dimen>
     <dimen name="taskbar_contextual_button_suw_margin">64dp</dimen>
     <dimen name="taskbar_contextual_button_suw_height">64dp</dimen>
     <dimen name="taskbar_back_button_suw_start_margin">48dp</dimen>
@@ -397,7 +397,6 @@
     <dimen name="transient_taskbar_key_shadow_distance">10dp</dimen>
     <dimen name="transient_taskbar_stashed_height">32dp</dimen>
     <dimen name="transient_taskbar_all_apps_button_translation_x_offset">8dp</dimen>
-    <dimen name="transient_taskbar_all_apps_button_translation_x_offset_for_expressive_theme">8dp</dimen>
     <dimen name="transient_taskbar_stash_spring_velocity_dp_per_s">400dp</dimen>
     <dimen name="taskbar_tooltip_vertical_padding">8dp</dimen>
     <dimen name="taskbar_tooltip_horizontal_padding">16dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index ea49c035f2..f743a4212a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -593,6 +593,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
                 && !mDeviceProfile.isTaskbarPresent;
     }
 
+    public boolean isTaskbarInMinimalState() {
+        return mControllers.taskbarViewController.isTaskbarInMinimalState();
+    }
+
     /**
      * @return {@code true} if {@link #isPhoneMode()} is true and we're using 3 button-nav
      */
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index e334a49e31..e4d44c1a84 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -404,6 +404,11 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
         } else {
             updateItemsWithoutLayoutTransition(hotseatItemInfos, recentTasks);
         }
+        mAllAppsButtonContainer.updateTaskbarMinimalState(isTaskbarInMinimalState());
+    }
+
+    public boolean isTaskbarInMinimalState() {
+        return getIconViews().length <= 1;
     }
 
     private void updateItemsWithoutLayoutTransition(
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index 99674fd35c..98710863dc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -1355,6 +1355,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
         return layoutTransition;
     }
 
+    public boolean isTaskbarInMinimalState() {
+        return mTaskbarView.isTaskbarInMinimalState();
+    }
+
     /**
      * To be called when the given Task is updated, so that we can tell TaskbarView to also update.
      * @param task The Task whose e.g. icon changed.
diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt
index 527c00dba3..b54e016511 100644
--- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt
@@ -49,6 +49,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
     private var allAppsTouchTriggered = false
     private var allAppsTouchRunnable: Runnable? = null
     private var allAppsButtonTouchDelayMs: Long = ViewConfiguration.getLongPressTimeout().toLong()
+    private var isTaskbarInMinimalState = false
     private lateinit var taskbarViewCallbacks: TaskbarViewCallbacks
 
     override val spaceNeeded: Int
@@ -117,22 +118,17 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 
     @DrawableRes
     private fun getAllAppsButtonForExpressiveTheme(): Int {
-        return R.drawable.ic_taskbar_all_apps_search_button_expressive_theme
-    }
-
-    @DimenRes
-    fun getAllAppsButtonTranslationXOffsetForExpressiveTheme(isTransientTaskbar: Boolean): Int {
-        return if (isTransientTaskbar) {
-            R.dimen.transient_taskbar_all_apps_button_translation_x_offset_for_expressive_theme
+        return if (isTaskbarInMinimalState) {
+            R.drawable.ic_taskbar_minimal_state_all_apps_search_button_expressive_theme
         } else {
-            R.dimen.taskbar_all_apps_search_button_translation_x_offset_for_expressive_theme
+            R.drawable.ic_taskbar_all_apps_search_button_expressive_theme
         }
     }
 
     @DimenRes
     fun getAllAppsButtonTranslationXOffset(isTransientTaskbar: Boolean): Int {
         if (Flags.enableGsf()) {
-            return getAllAppsButtonTranslationXOffsetForExpressiveTheme(isTransientTaskbar)
+            return R.dimen.taskbar_all_apps_search_button_translation_x_offset_for_expressive_theme
         }
         return if (isTransientTaskbar) {
             R.dimen.transient_taskbar_all_apps_button_translation_x_offset
@@ -141,6 +137,14 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
         }
     }
 
+    /** Taskbar minimal state is that taskbar does not host anything other than all apps button. */
+    fun updateTaskbarMinimalState(isInMinimalState: Boolean) {
+        if (isTaskbarInMinimalState != isInMinimalState) {
+            isTaskbarInMinimalState = isInMinimalState
+            setUpIcon()
+        }
+    }
+
     private fun onAllAppsButtonTouch(view: View, ev: MotionEvent): Boolean {
         when (ev.action) {
             MotionEvent.ACTION_DOWN -> {
diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt
index 81a4a1b35d..3245c3db27 100644
--- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt
@@ -40,6 +40,9 @@ private constructor(private val taskbarActivityContext: TaskbarActivityContext)
     val isLandscape: Boolean
         get() = taskbarActivityContext.deviceProfile.isLandscape
 
+    val isTnMinimalState: Boolean
+        get() = taskbarActivityContext.isTaskbarInMinimalState
+
     val supportsPinningPopup: Boolean
         // TODO(b/381535785): Allow pinning for desktop taskbar when desktop mode transient behavior
         //     gets updated to retain pinned UI, but translate the taskbar offscreen.
diff --git a/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml b/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml
index ed4a821c79..852a077221 100644
--- a/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml
+++ b/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="52"
     android:viewportHeight="52">
     <path
-        android:pathData="M32.862,38.75C31.263,38.75 29.888,38.175 28.737,37.025C27.587,35.875 27.013,34.487 27.013,32.862C27.013,31.237 27.587,29.85 28.737,28.7C29.888,27.55 31.263,26.975 32.862,26.975C34.487,26.975 35.875,27.55 37.025,28.7C38.175,29.85 38.75,31.237 38.75,32.862C38.75,33.438 38.662,33.987 38.487,34.513C38.338,35.037 38.125,35.525 37.85,35.975L41.45,39.612C41.6,39.737 41.7,39.875 41.75,40.025C41.825,40.175 41.862,40.338 41.862,40.513C41.862,40.688 41.825,40.85 41.75,41C41.7,41.15 41.6,41.3 41.45,41.45C41.325,41.575 41.188,41.675 41.037,41.75C40.888,41.8 40.725,41.825 40.55,41.825C40.375,41.825 40.213,41.8 40.063,41.75C39.912,41.675 39.763,41.575 39.612,41.45L35.975,37.85C35.525,38.15 35.037,38.375 34.513,38.525C33.987,38.675 33.438,38.75 32.862,38.75ZM16.1,38.75C14.5,38.75 13.125,38.175 11.975,37.025C10.825,35.875 10.25,34.5 10.25,32.9C10.25,31.25 10.825,29.85 11.975,28.7C13.125,27.55 14.5,26.975 16.1,26.975C17.75,26.975 19.15,27.55 20.3,28.7C21.45,29.85 22.025,31.25 22.025,32.9C22.025,34.5 21.45,35.875 20.3,37.025C19.15,38.175 17.75,38.75 16.1,38.75ZM32.862,36.125C33.763,36.125 34.525,35.813 35.15,35.188C35.8,34.537 36.125,33.775 36.125,32.9C36.125,31.975 35.8,31.2 35.15,30.575C34.525,29.925 33.763,29.6 32.862,29.6C31.962,29.6 31.188,29.925 30.538,30.575C29.913,31.2 29.6,31.975 29.6,32.9C29.6,33.775 29.913,34.537 30.538,35.188C31.188,35.813 31.962,36.125 32.862,36.125ZM16.1,22.025C14.5,22.025 13.125,21.45 11.975,20.3C10.825,19.15 10.25,17.763 10.25,16.138C10.25,14.512 10.825,13.125 11.975,11.975C13.125,10.825 14.5,10.25 16.1,10.25C17.75,10.25 19.15,10.825 20.3,11.975C21.45,13.125 22.025,14.512 22.025,16.138C22.025,17.763 21.45,19.15 20.3,20.3C19.15,21.45 17.75,22.025 16.1,22.025ZM32.862,22.025C31.237,22.025 29.85,21.45 28.7,20.3C27.55,19.15 26.975,17.763 26.975,16.138C26.975,14.512 27.55,13.125 28.7,11.975C29.85,10.825 31.237,10.25 32.862,10.25C34.487,10.25 35.875,10.825 37.025,11.975C38.175,13.125 38.75,14.512 38.75,16.138C38.75,17.763 38.175,19.15 37.025,20.3C35.875,21.45 34.487,22.025 32.862,22.025Z"
+        android:pathData="M40.862,40.25C39.263,40.25 37.888,39.675 36.737,38.525C35.588,37.375 35.013,35.987 35.013,34.362C35.013,32.737 35.588,31.35 36.737,30.2C37.888,29.05 39.263,28.475 40.862,28.475C42.487,28.475 43.875,29.05 45.025,30.2C46.175,31.35 46.75,32.737 46.75,34.362C46.75,34.938 46.662,35.487 46.487,36.013C46.338,36.537 46.125,37.025 45.85,37.475L49.45,41.112C49.6,41.237 49.7,41.375 49.75,41.525C49.825,41.675 49.862,41.838 49.862,42.013C49.862,42.188 49.825,42.35 49.75,42.5C49.7,42.65 49.6,42.8 49.45,42.95C49.325,43.075 49.188,43.175 49.037,43.25C48.888,43.3 48.725,43.325 48.55,43.325C48.375,43.325 48.213,43.3 48.063,43.25C47.912,43.175 47.763,43.075 47.612,42.95L43.975,39.35C43.525,39.65 43.037,39.875 42.513,40.025C41.987,40.175 41.438,40.25 40.862,40.25ZM24.1,40.25C22.5,40.25 21.125,39.675 19.975,38.525C18.825,37.375 18.25,36 18.25,34.4C18.25,32.75 18.825,31.35 19.975,30.2C21.125,29.05 22.5,28.475 24.1,28.475C25.75,28.475 27.15,29.05 28.3,30.2C29.45,31.35 30.025,32.75 30.025,34.4C30.025,36 29.45,37.375 28.3,38.525C27.15,39.675 25.75,40.25 24.1,40.25ZM40.862,37.625C41.763,37.625 42.525,37.313 43.15,36.688C43.8,36.037 44.125,35.275 44.125,34.4C44.125,33.475 43.8,32.7 43.15,32.075C42.525,31.425 41.763,31.1 40.862,31.1C39.963,31.1 39.188,31.425 38.537,32.075C37.912,32.7 37.6,33.475 37.6,34.4C37.6,35.275 37.912,36.037 38.537,36.688C39.188,37.313 39.963,37.625 40.862,37.625ZM24.1,23.525C22.5,23.525 21.125,22.95 19.975,21.8C18.825,20.65 18.25,19.263 18.25,17.638C18.25,16.013 18.825,14.625 19.975,13.475C21.125,12.325 22.5,11.75 24.1,11.75C25.75,11.75 27.15,12.325 28.3,13.475C29.45,14.625 30.025,16.013 30.025,17.638C30.025,19.263 29.45,20.65 28.3,21.8C27.15,22.95 25.75,23.525 24.1,23.525ZM40.862,23.525C39.237,23.525 37.85,22.95 36.7,21.8C35.55,20.65 34.975,19.263 34.975,17.638C34.975,16.013 35.55,14.625 36.7,13.475C37.85,12.325 39.237,11.75 40.862,11.75C42.487,11.75 43.875,12.325 45.025,13.475C46.175,14.625 46.75,16.013 46.75,17.638C46.75,19.263 46.175,20.65 45.025,21.8C43.875,22.95 42.487,23.525 40.862,23.525Z"
         android:fillColor="#FF000000"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_taskbar_minimal_state_all_apps_search_button_expressive_theme.xml b/res/drawable/ic_taskbar_minimal_state_all_apps_search_button_expressive_theme.xml
new file mode 100644
index 0000000000..ed4a821c79
--- /dev/null
+++ b/res/drawable/ic_taskbar_minimal_state_all_apps_search_button_expressive_theme.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2025 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="52dp"
+    android:height="52dp"
+    android:viewportWidth="52"
+    android:viewportHeight="52">
+    <path
+        android:pathData="M32.862,38.75C31.263,38.75 29.888,38.175 28.737,37.025C27.587,35.875 27.013,34.487 27.013,32.862C27.013,31.237 27.587,29.85 28.737,28.7C29.888,27.55 31.263,26.975 32.862,26.975C34.487,26.975 35.875,27.55 37.025,28.7C38.175,29.85 38.75,31.237 38.75,32.862C38.75,33.438 38.662,33.987 38.487,34.513C38.338,35.037 38.125,35.525 37.85,35.975L41.45,39.612C41.6,39.737 41.7,39.875 41.75,40.025C41.825,40.175 41.862,40.338 41.862,40.513C41.862,40.688 41.825,40.85 41.75,41C41.7,41.15 41.6,41.3 41.45,41.45C41.325,41.575 41.188,41.675 41.037,41.75C40.888,41.8 40.725,41.825 40.55,41.825C40.375,41.825 40.213,41.8 40.063,41.75C39.912,41.675 39.763,41.575 39.612,41.45L35.975,37.85C35.525,38.15 35.037,38.375 34.513,38.525C33.987,38.675 33.438,38.75 32.862,38.75ZM16.1,38.75C14.5,38.75 13.125,38.175 11.975,37.025C10.825,35.875 10.25,34.5 10.25,32.9C10.25,31.25 10.825,29.85 11.975,28.7C13.125,27.55 14.5,26.975 16.1,26.975C17.75,26.975 19.15,27.55 20.3,28.7C21.45,29.85 22.025,31.25 22.025,32.9C22.025,34.5 21.45,35.875 20.3,37.025C19.15,38.175 17.75,38.75 16.1,38.75ZM32.862,36.125C33.763,36.125 34.525,35.813 35.15,35.188C35.8,34.537 36.125,33.775 36.125,32.9C36.125,31.975 35.8,31.2 35.15,30.575C34.525,29.925 33.763,29.6 32.862,29.6C31.962,29.6 31.188,29.925 30.538,30.575C29.913,31.2 29.6,31.975 29.6,32.9C29.6,33.775 29.913,34.537 30.538,35.188C31.188,35.813 31.962,36.125 32.862,36.125ZM16.1,22.025C14.5,22.025 13.125,21.45 11.975,20.3C10.825,19.15 10.25,17.763 10.25,16.138C10.25,14.512 10.825,13.125 11.975,11.975C13.125,10.825 14.5,10.25 16.1,10.25C17.75,10.25 19.15,10.825 20.3,11.975C21.45,13.125 22.025,14.512 22.025,16.138C22.025,17.763 21.45,19.15 20.3,20.3C19.15,21.45 17.75,22.025 16.1,22.025ZM32.862,22.025C31.237,22.025 29.85,21.45 28.7,20.3C27.55,19.15 26.975,17.763 26.975,16.138C26.975,14.512 27.55,13.125 28.7,11.975C29.85,10.825 31.237,10.25 32.862,10.25C34.487,10.25 35.875,10.825 37.025,11.975C38.175,13.125 38.75,14.512 38.75,16.138C38.75,17.763 38.175,19.15 37.025,20.3C35.875,21.45 34.487,22.025 32.862,22.025Z"
+        android:fillColor="#FF000000"/>
+</vector>
\ No newline at end of file