diff --git a/extract-files.sh b/extract-files.sh
index c1d867d..5be273a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -64,7 +64,12 @@ function blob_fixup() {
         system/priv-app/MiuiCamera/MiuiCamera.apk)
             tmp_dir="${EXTRACT_TMP_DIR}/MiuiCamera"
             $APKTOOL d -q "$2" -o "$tmp_dir" -f
+            echo "    - Patching apk..."
+            # Use Google photos instead of MIUI gallery
             grep -rl "com.miui.gallery" "$tmp_dir" | xargs sed -i 's|"com.miui.gallery"|"com.google.android.apps.photos"|g'
+            # Use the correct launcher icon
+            sed -i "s/ic_launcher_camera_cv/ic_launcher_camera/" "$tmp_dir/AndroidManifest.xml"
+            echo "    - Rebuilding apk..."
             $APKTOOL b -q "$tmp_dir" -o "$2"
             rm -rf "$tmp_dir"
             split --bytes=20M -d "$2" "$2".part
diff --git a/miuicamera.mk b/miuicamera.mk
index 36e1bf8..3fd8c26 100644
--- a/miuicamera.mk
+++ b/miuicamera.mk
@@ -8,7 +8,6 @@ CAMERA_PACKAGE_NAME := com.android.camera
 
 # Overlays
 PRODUCT_PACKAGES += \
-    MiuiCameraOverlayIcon \
     MiuiCameraOverlayLeicaed
 
 # Permissions
diff --git a/overlays/MiuiCameraOverlayIcon/Android.bp b/overlays/MiuiCameraOverlayIcon/Android.bp
deleted file mode 100644
index 6a1b9f2..0000000
--- a/overlays/MiuiCameraOverlayIcon/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2023 Paranoid Android
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "MiuiCameraOverlayIcon",
-    product_specific: true,
-}
diff --git a/overlays/MiuiCameraOverlayIcon/AndroidManifest.xml b/overlays/MiuiCameraOverlayIcon/AndroidManifest.xml
deleted file mode 100644
index e6b5d99..0000000
--- a/overlays/MiuiCameraOverlayIcon/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.camera.overlay.icon">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="800"
-        android:targetPackage="com.android.camera" />
-</manifest>
diff --git a/overlays/MiuiCameraOverlayIcon/res/mipmap-xhdpi/ic_launcher_camera_cv.png b/overlays/MiuiCameraOverlayIcon/res/mipmap-xhdpi/ic_launcher_camera_cv.png
deleted file mode 100644
index d6f64e7..0000000
Binary files a/overlays/MiuiCameraOverlayIcon/res/mipmap-xhdpi/ic_launcher_camera_cv.png and /dev/null differ
diff --git a/overlays/MiuiCameraOverlayIcon/res/mipmap-xxhdpi/ic_launcher_camera_cv.png b/overlays/MiuiCameraOverlayIcon/res/mipmap-xxhdpi/ic_launcher_camera_cv.png
deleted file mode 100644
index 51608cb..0000000
Binary files a/overlays/MiuiCameraOverlayIcon/res/mipmap-xxhdpi/ic_launcher_camera_cv.png and /dev/null differ
diff --git a/overlays/MiuiCameraOverlayIcon/res/mipmap-xxxhdpi/ic_launcher_camera_cv.png b/overlays/MiuiCameraOverlayIcon/res/mipmap-xxxhdpi/ic_launcher_camera_cv.png
deleted file mode 100644
index b4723c2..0000000
Binary files a/overlays/MiuiCameraOverlayIcon/res/mipmap-xxxhdpi/ic_launcher_camera_cv.png and /dev/null differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part00 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part00
index 97d586c..1e4b081 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part00 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part00 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part01 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part01
index 7e12e5a..fc9f8e6 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part01 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part01 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part02 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part02
index b07e06f..c160fa8 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part02 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part02 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part03 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part03
index e03f0c3..c35a778 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part03 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part03 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part04 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part04
index 9062c1e..7fab443 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part04 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part04 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part05 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part05
index 28162c9..5d3632f 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part05 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part05 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part06 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part06
index fdac609..976406e 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part06 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part06 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part07 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part07
index ed8eecd..6f1ff2d 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part07 and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part07 differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part08 b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part08
new file mode 100644
index 0000000..9ba7bef
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part08 differ