Adjust search bar app icon size/alignment

Fixes: 134764696
Test: Manual
Change-Id: Idb9f0d6ef76d0aab4414c0d487c9534d52eb82dc
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 1c8d55f..97b73ec 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -26,14 +26,15 @@
         android:orientation="horizontal"
         android:gravity="center"
         android:background="@drawable/appbar_view_icon_background"
-        app:switchingEnabled="false"/>
+        app:switchingEnabled="false"
+        app:appIconSize="@dimen/appbar_view_search_app_icon_size"/>
 
     <EditText
         android:id="@+id/search_bar"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:paddingStart="@dimen/appbar_view_search_bar_padding"
-        android:layout_marginStart="@dimen/appbar_view_search_margin"
+        android:layout_marginStart="@dimen/appbar_view_search_app_icon_margin"
         android:hint="@string/search_hint"
         android:textColorHint="@color/search_hint_text_color"
         android:textCursorDrawable="@null"
@@ -47,7 +48,7 @@
         android:id="@+id/search_close"
         android:layout_width="@dimen/appbar_view_icon_touch_target_size"
         android:layout_height="@dimen/appbar_view_icon_touch_target_size"
-        android:layout_marginStart="@dimen/appbar_view_search_margin"
+        android:layout_marginStart="@dimen/appbar_view_search_close_icon_margin"
         android:padding="@dimen/appbar_view_icon_padding"
         android:background="@drawable/appbar_view_icon_background"
         android:visibility="gone"