diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 67e742c2c86..64ddb6d47f6 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -39,10 +39,11 @@
     </Toolbar>
     <ImageView
         android:id="@+id/account_avatar"
-        android:layout_marginStart="@dimen/search_bar_avatar_start_margin"
-        android:layout_marginEnd="@dimen/search_bar_avatar_end_margin"
-        android:layout_width="@dimen/search_bar_avatar_size"
-        android:layout_height="@dimen/search_bar_avatar_size"
-        android:layout_gravity="end|center_vertical"
+        android:paddingEnd="@dimen/search_bar_avatar_end_padding"
+        android:paddingTop="@dimen/search_bar_avatar_top_bottom_padding"
+        android:paddingBottom="@dimen/search_bar_avatar_top_bottom_padding"
+        android:layout_width="@dimen/search_bar_avatar_width"
+        android:layout_height="@dimen/search_bar_height"
+        android:layout_gravity="end"
         android:contentDescription="@string/search_bar_account_avatar_content_description"/>
 </com.google.android.material.card.MaterialCardView>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 963d19ff4cb..763d8f5a80b 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -105,9 +105,11 @@
     <dimen name="search_bar_text_size">16dp</dimen>
     <dimen name="search_bar_card_elevation">2dp</dimen>
     <dimen name="search_bar_content_inset">64dp</dimen>
-    <dimen name="search_bar_avatar_size">32dp</dimen>
-    <dimen name="search_bar_avatar_start_margin">4dp</dimen>
-    <dimen name="search_bar_avatar_end_margin">16dp</dimen>
+    <dimen name="search_bar_avatar_end_padding">16dp</dimen>
+    <!-- 32dp (avatar size) + 16 dp (search_bar_avatar_end_padding) -->
+    <dimen name="search_bar_avatar_width">48dp</dimen>
+    <!-- (search_bar_height 48dp - avatar size 32dp) / 2  -->
+    <dimen name="search_bar_avatar_top_bottom_padding">8dp</dimen>
 
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>