diff --git a/lawnchair/res/layout/search_container_all_apps.xml b/lawnchair/res/layout/search_container_all_apps.xml
index 9966792c6d..cfc391aa07 100644
--- a/lawnchair/res/layout/search_container_all_apps.xml
+++ b/lawnchair/res/layout/search_container_all_apps.xml
@@ -25,8 +25,8 @@
     <FrameLayout
         android:id="@+id/search_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/search_box_height"
-        android:layout_gravity="bottom"
+        android:layout_height="@dimen/qsb_icon_width"
+        android:layout_gravity="center"
         android:background="@drawable/search_input_fg"
         android:clickable="false"
         android:focusable="true"
@@ -72,7 +72,7 @@
         android:id="@+id/search_icon"
         android:layout_width="@dimen/search_box_height"
         android:layout_height="@dimen/search_box_height"
-        android:layout_gravity="bottom|center|start"
+        android:layout_gravity="center|start"
         android:background="@drawable/pill_ripple"
         android:layout_marginEnd="6dp"
         android:clickable="true"
@@ -84,30 +84,33 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="@dimen/search_box_height"
-        android:layout_gravity="bottom|end|center"
+        android:layout_gravity="end|center"
         android:clipToPadding="false"
         android:orientation="horizontal"
         tools:ignore="RtlSymmetry">
 
         <app.lawnchair.qsb.AssistantIconView
             android:id="@+id/mic_btn"
-            android:layout_width="@dimen/search_box_height"
+            android:layout_width="@dimen/qsb_icon_width"
             android:layout_height="@dimen/search_box_height"
             android:background="@drawable/pill_ripple"
             android:clickable="true"
             android:contentDescription="@string/label_voice_search"
-            android:scaleType="center"
+            android:scaleType="fitCenter"
+            android:padding="@dimen/qsb_icon_padding"
             android:src="@drawable/ic_remove_no_shadow"
             app:tint="?android:textColorSecondary" />
 
         <ImageButton
             android:id="@+id/lens_btn"
-            android:layout_width="@dimen/search_box_height"
+            android:layout_width="@dimen/qsb_icon_width"
             android:layout_height="@dimen/search_box_height"
             android:background="@drawable/pill_ripple"
             android:clickable="true"
+            android:layout_marginStart="-6dp"
             android:contentDescription="@string/label_lens"
-            android:scaleType="center"
+            android:scaleType="fitCenter"
+            android:padding="@dimen/qsb_icon_padding"
             android:src="@drawable/ic_remove_no_shadow"
             app:tint="?android:textColorSecondary" />
 
diff --git a/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt b/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt
index 1d7079d7e7..32030be816 100644
--- a/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt
+++ b/lawnchair/src/app/lawnchair/allapps/AllAppsSearchInput.kt
@@ -30,6 +30,7 @@ import app.lawnchair.preferences2.subscribeBlocking
 import app.lawnchair.qsb.AssistantIconView
 import app.lawnchair.qsb.LawnQsbLayout.Companion.getLensIntent
 import app.lawnchair.qsb.LawnQsbLayout.Companion.getSearchProvider
+import app.lawnchair.qsb.ThemingMethod
 import app.lawnchair.qsb.providers.Google
 import app.lawnchair.qsb.providers.GoogleGo
 import app.lawnchair.qsb.providers.PixelSearch
@@ -152,6 +153,13 @@ class AllAppsSearchInput(context: Context, attrs: AttributeSet?) :
                         themed = themed || iconRes == R.drawable.ic_qsb_search,
                         method = searchProvider.themingMethod,
                     )
+                } else {
+                    // Always theme default search icon
+                    setThemedIconResource(
+                        resId = R.drawable.ic_qsb_search,
+                        themed = true,
+                        method = ThemingMethod.TINT,
+                    )
                 }
 
                 setOnClickListener {