diff --git a/res/layout/spinner_view.xml b/res/layout/spinner_view.xml
index 8ab35163ab1..2c02299d2ea 100644
--- a/res/layout/spinner_view.xml
+++ b/res/layout/spinner_view.xml
@@ -15,10 +15,9 @@
 -->
 
 <Spinner xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/profile_spinner"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/user_spinner_height"
-        android:overlapAnchor="true"
-        android:paddingBottom="@dimen/user_spinner_padding"
-        android:paddingTop="@dimen/user_spinner_padding"
-        android:paddingLeft="@dimen/user_spinner_padding" />
+         android:id="@+id/profile_spinner"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:paddingStart="@dimen/user_spinner_padding"
+         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+         android:layout_centerVertical="true"/>
\ No newline at end of file
diff --git a/res/layout/user_preference.xml b/res/layout/user_preference.xml
new file mode 100644
index 00000000000..2b80bb78c55
--- /dev/null
+++ b/res/layout/user_preference.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/widget_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="12dp"
+        android:paddingEnd="@dimen/user_spinner_padding_sides"
+        android:orientation="horizontal" >
+
+    <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/user_icon_view_height"
+            android:layout_height="@dimen/user_icon_view_height"
+            android:layout_gravity="center"
+            android:scaleType="fitCenter" />
+
+    <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:paddingStart="8dp"
+            android:labelFor="@android:id/icon"
+            style="@style/SettingsSpinnerTitleBar" />
+
+</LinearLayout>