diff --git a/app/src/main/java/emu/skyline/preference/ProfilePicturePreference.kt b/app/src/main/java/emu/skyline/preference/ProfilePicturePreference.kt
index 7f0c2c6f..d4574229 100644
--- a/app/src/main/java/emu/skyline/preference/ProfilePicturePreference.kt
+++ b/app/src/main/java/emu/skyline/preference/ProfilePicturePreference.kt
@@ -19,14 +19,18 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.preference.Preference
 import androidx.preference.Preference.SummaryProvider
 import androidx.preference.PreferenceManager
-import androidx.preference.R
+import emu.skyline.R
 import emu.skyline.SkylineApplication
 import emu.skyline.getPublicFilesDir
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
 
-class ProfilePicturePreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.preferenceStyle) : Preference(context, attrs, defStyleAttr) {
+class ProfilePicturePreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = androidx.preference.R.attr.preferenceStyle) : Preference(context, attrs, defStyleAttr) {
+    init {
+        layoutResource = R.layout.preference_profile_picture
+    }
+
     private val skylineFilesDir = SkylineApplication.instance.getPublicFilesDir().canonicalPath
     private val profilePictureDir = "$skylineFilesDir/switch/nand/system/save/8000000000000010/su/avators"
     private val profilePicture = "$profilePictureDir/profile_picture.jpeg"
diff --git a/app/src/main/res/layout/controller_checkbox_item.xml b/app/src/main/res/layout/controller_checkbox_item.xml
index 3763f5a0..c403a3bb 100644
--- a/app/src/main/res/layout/controller_checkbox_item.xml
+++ b/app/src/main/res/layout/controller_checkbox_item.xml
@@ -9,7 +9,7 @@
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:orientation="horizontal"
-    android:paddingStart="72dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/controller_header.xml b/app/src/main/res/layout/controller_header.xml
index e958a82e..4c49adfc 100644
--- a/app/src/main/res/layout/controller_header.xml
+++ b/app/src/main/res/layout/controller_header.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
     android:layout_marginBottom="16dp"
-    android:paddingStart="72dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:textAlignment="viewStart"
     android:textColor="?attr/colorAccent"
diff --git a/app/src/main/res/layout/controller_item.xml b/app/src/main/res/layout/controller_item.xml
index f5183725..06cf2359 100644
--- a/app/src/main/res/layout/controller_item.xml
+++ b/app/src/main/res/layout/controller_item.xml
@@ -12,7 +12,7 @@
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:orientation="vertical"
-    android:paddingStart="72dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingTop="16dp"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingBottom="16dp">
diff --git a/app/src/main/res/layout/preference_profile_picture.xml b/app/src/main/res/layout/preference_profile_picture.xml
new file mode 100644
index 00000000..f90ad9a2
--- /dev/null
+++ b/app/src/main/res/layout/preference_profile_picture.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    tools:ignore="PrivateResource">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            tools:text="Profile picture" />
+
+        <TextView
+            android:id="@android:id/summary"
+            style="@style/PreferenceSummaryTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_gravity="start"
+            android:maxLines="10"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="No picture selected" />
+
+    </RelativeLayout>
+
+    <com.google.android.material.card.MaterialCardView
+        style="@style/Widget.Material3.CardView.Elevated"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:id="@+id/icon_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start|center_vertical"
+            android:orientation="horizontal">
+
+            <androidx.preference.internal.PreferenceImageView
+                android:id="@android:id/icon"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:maxHeight="56dp"
+                app:maxWidth="56dp"
+                tools:layout_height="56dp"
+                tools:layout_width="56dp" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw360dp-v13/values-preference.xml b/app/src/main/res/values-sw360dp-v13/values-preference.xml
new file mode 100644
index 00000000..1306a0fb
--- /dev/null
+++ b/app/src/main/res/values-sw360dp-v13/values-preference.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Override of the resources used by androidx preferences -->
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Remove preserved icon space -->
+    <bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource,PrivateResource">false</bool>
+</resources>