diff --git a/common.mk b/common.mk
index a8e619d..c72591c 100644
--- a/common.mk
+++ b/common.mk
@@ -32,14 +32,6 @@ DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
     $(LOCAL_PATH)/overlay-lineage
 
-PRODUCT_PACKAGES += \
-    OnePlusIconShapeCircleOverlay \
-    OnePlusIconShapeRoundedRectOverlay \
-    OnePlusIconShapeSquareOverlay \
-    OnePlusIconShapeSquircleOverlay \
-    OnePlusIconShapeTeardropOverlay \
-    OPFrameworkConfigOverlay
-
 # VNDK
 PRODUCT_TARGET_VNDK_VERSION := 30
 PRODUCT_USE_PRODUCT_VNDK_OVERRIDE := true
diff --git a/overlay/packages/apps/overlays/OPFrameworkConfigOverlay/Android.mk b/overlay/packages/apps/overlays/OPFrameworkConfigOverlay/Android.mk
deleted file mode 100644
index c529e8e..0000000
--- a/overlay/packages/apps/overlays/OPFrameworkConfigOverlay/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := OPFrameworkConfigOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/overlay
-
-include $(BUILD_PACKAGE)
diff --git a/overlay/packages/apps/overlays/OPFrameworkConfigOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/OPFrameworkConfigOverlay/AndroidManifest.xml
deleted file mode 100644
index 0c3608a..0000000
--- a/overlay/packages/apps/overlays/OPFrameworkConfigOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.oneplus.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="1337"/>
-</manifest>
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeCircleOverlay/Android.mk b/overlay/packages/apps/overlays/OnePlusIconShapeCircleOverlay/Android.mk
deleted file mode 100644
index 0b906b3..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeCircleOverlay/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := OnePlusIconShapeCircleOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/overlay/oneplus_shape_circle
-
-include $(BUILD_PACKAGE)
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeCircleOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/OnePlusIconShapeCircleOverlay/AndroidManifest.xml
deleted file mode 100644
index 15c57e8..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeCircleOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.oneplus.theme.icon.circle"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="1337"/>
-</manifest>
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeRoundedRectOverlay/Android.mk b/overlay/packages/apps/overlays/OnePlusIconShapeRoundedRectOverlay/Android.mk
deleted file mode 100644
index fecc886..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeRoundedRectOverlay/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := OnePlusIconShapeRoundedRectOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/overlay/oneplus_shape_roundedrect
-
-include $(BUILD_PACKAGE)
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeRoundedRectOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/OnePlusIconShapeRoundedRectOverlay/AndroidManifest.xml
deleted file mode 100644
index c021b9e..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeRoundedRectOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.oneplus.theme.icon.roundedrect"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="1337"/>
-</manifest>
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeSquareOverlay/Android.mk b/overlay/packages/apps/overlays/OnePlusIconShapeSquareOverlay/Android.mk
deleted file mode 100644
index b8c54a5..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeSquareOverlay/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := OnePlusIconShapeSquareOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/overlay/oneplus_shape_square
-
-include $(BUILD_PACKAGE)
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeSquareOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/OnePlusIconShapeSquareOverlay/AndroidManifest.xml
deleted file mode 100644
index 22ca271..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeSquareOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.oneplus.theme.icon.square"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="1337"/>
-</manifest>
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeSquircleOverlay/Android.mk b/overlay/packages/apps/overlays/OnePlusIconShapeSquircleOverlay/Android.mk
deleted file mode 100644
index beb8eee..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeSquircleOverlay/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := OnePlusIconShapeSquircleOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/overlay/oneplus_shape_squircle
-
-include $(BUILD_PACKAGE)
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeSquircleOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/OnePlusIconShapeSquircleOverlay/AndroidManifest.xml
deleted file mode 100644
index da4b3b4..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeSquircleOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.oneplus.theme.icon.squircle"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="1337"/>
-</manifest>
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeTeardropOverlay/Android.mk b/overlay/packages/apps/overlays/OnePlusIconShapeTeardropOverlay/Android.mk
deleted file mode 100644
index f5a91b0..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeTeardropOverlay/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := OnePlusIconShapeTeardropOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/overlay/oneplus_shape_teardrop
-
-include $(BUILD_PACKAGE)
diff --git a/overlay/packages/apps/overlays/OnePlusIconShapeTeardropOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/OnePlusIconShapeTeardropOverlay/AndroidManifest.xml
deleted file mode 100644
index ebe3b5f..0000000
--- a/overlay/packages/apps/overlays/OnePlusIconShapeTeardropOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.oneplus.theme.icon.teardrop"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="1337"/>
-</manifest>