diff --git a/app/build.gradle b/app/build.gradle
index efb8a8f7daa..61778cc6f4f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -304,7 +304,11 @@ dependencies {
     implementation "io.noties.markwon:ext-tasklist:$markwonVersion"
     implementation "io.noties.markwon:ext-tables:$markwonVersion"
 
+    // Avatar picker
     implementation 'com.github.nextcloud-deps:ImagePicker:2.1.0.2'
+    // Override avatar picker's internal crop lib for better dge-to-edge support
+    implementation 'com.github.yalantis:ucrop:2.2.11'
+
     implementation 'io.github.elye:loaderviewlibrary:3.0.0'
     implementation 'org.osmdroid:osmdroid-android:6.1.20'
     implementation ('fr.dudie:nominatim-api:3.4', {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 29ebb5715ca..5da4d1fc8da 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -253,6 +253,16 @@
             android:name=".conversationinfo.ConversationInfoActivity"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name="com.github.dhaval2404.imagepicker.ImagePickerActivity"
+            android:theme="@style/ImagePickerTheme.NonFullScreen"
+            tools:replace="android:theme" />
+
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:theme="@style/Theme.UCrop"
+            tools:replace="android:theme" />
+
         <activity
             android:name=".conversationinfoedit.ConversationInfoEditActivity"
             android:theme="@style/AppTheme" />
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index e0c258e7872..198bf5b6301 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -30,4 +30,9 @@
         <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
         <item name="android:alertDialogTheme">?alertDialogTheme</item>
     </style>
+
+    <style name="ImagePickerTheme.NonFullScreen" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:fitsSystemWindows">true</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b58fecc262..408e6ea7bbb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,6 +44,28 @@
         <item name="iconTint">@color/fontAppbar</item>
     </style>
 
+    <style name="ImagePickerTheme.NonFullScreen" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:fitsSystemWindows">true</item>
+    </style>
+
+    <style name="Theme.UCrop" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Status bar: dark background, white (light) icons -->
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+
+        <!-- Navigation bar: dark to match -->
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <!-- Force a light (white) toolbar surface even in dark mode -->
+        <item name="colorSurface">#FFFFFF</item>
+        <item name="colorOnSurface">#000000</item>
+
+        <!-- Primary used as toolbar tint fallback -->
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorOnPrimary">#000000</item>
+    </style>
+
+
     <style name="ChatSendButtonMenu" parent="@style/Widget.Material3.PopupMenu">
         <item name="android:dropDownVerticalOffset">-90dp</item>
         <item name="android:colorPrimary">@color/fg_inverse</item>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bae2f08dd72..74cf1937da2 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -18125,6 +18125,14 @@
             <sha256 value="2e65fbabc8876cb388abf006b399ed5241e963940e0798d0e2310e339aaf738b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.yalantis" name="ucrop" version="2.2.11">
+         <artifact name="ucrop-2.2.11.aar">
+            <sha256 value="c12db23784aaa954d8998106cf5c1cfee2993c62f7601c790da8e21d4c51a0a9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="ucrop-2.2.11.pom">
+            <sha256 value="1e070fcc04b929e8b0f847463240550a1639e4bc2e7110b0a57f4f1366247580" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.yalantis" name="ucrop" version="2.2.6">
          <artifact name="ucrop-2.2.6.aar">
             <sha256 value="aa2a5929b6916d05d347a24ddb1319e0330f109f683b9080897d73fdb8638e6b" origin="Generated by Gradle" reason="Artifact is not signed"/>