diff --git a/overlay/packages/apps/DocumentsUI/res/mipmap-anydpi/ic_launcher.xml b/overlay/packages/apps/DocumentsUI/res/mipmap-anydpi/ic_launcher.xml
deleted file mode 100644
index c6241fe..0000000
--- a/overlay/packages/apps/DocumentsUI/res/mipmap-anydpi/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@*android:color/accent_device_default_light"/>
-    <foreground android:drawable="@mipmap/ic_foreground"/>
-</adaptive-icon>
diff --git a/overlay/packages/apps/DocumentsUI/res/mipmap-hdpi/ic_foreground.png b/overlay/packages/apps/DocumentsUI/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index 992c44e..0000000
Binary files a/overlay/packages/apps/DocumentsUI/res/mipmap-hdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/DocumentsUI/res/mipmap-mdpi/ic_foreground.png b/overlay/packages/apps/DocumentsUI/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index 4639ff0..0000000
Binary files a/overlay/packages/apps/DocumentsUI/res/mipmap-mdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/DocumentsUI/res/mipmap-xhdpi/ic_foreground.png b/overlay/packages/apps/DocumentsUI/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index b992944..0000000
Binary files a/overlay/packages/apps/DocumentsUI/res/mipmap-xhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/DocumentsUI/res/mipmap-xxhdpi/ic_foreground.png b/overlay/packages/apps/DocumentsUI/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index ae44b2f..0000000
Binary files a/overlay/packages/apps/DocumentsUI/res/mipmap-xxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/DocumentsUI/res/mipmap-xxxhdpi/ic_foreground.png b/overlay/packages/apps/DocumentsUI/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index 85150eb..0000000
Binary files a/overlay/packages/apps/DocumentsUI/res/mipmap-xxxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/Settings/res/mipmap-anydpi/ic_launcher.xml b/overlay/packages/apps/Settings/res/mipmap-anydpi/ic_launcher.xml
deleted file mode 100644
index c6241fe..0000000
--- a/overlay/packages/apps/Settings/res/mipmap-anydpi/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@*android:color/accent_device_default_light"/>
-    <foreground android:drawable="@mipmap/ic_foreground"/>
-</adaptive-icon>
diff --git a/overlay/packages/apps/Settings/res/mipmap-hdpi/ic_foreground.png b/overlay/packages/apps/Settings/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index ddce98e..0000000
Binary files a/overlay/packages/apps/Settings/res/mipmap-hdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/Settings/res/mipmap-mdpi/ic_foreground.png b/overlay/packages/apps/Settings/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index 86f3be8..0000000
Binary files a/overlay/packages/apps/Settings/res/mipmap-mdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/Settings/res/mipmap-xhdpi/ic_foreground.png b/overlay/packages/apps/Settings/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index 360aa69..0000000
Binary files a/overlay/packages/apps/Settings/res/mipmap-xhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/Settings/res/mipmap-xxhdpi/ic_foreground.png b/overlay/packages/apps/Settings/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index 7cb67a9..0000000
Binary files a/overlay/packages/apps/Settings/res/mipmap-xxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlay/packages/apps/Settings/res/mipmap-xxxhdpi/ic_foreground.png b/overlay/packages/apps/Settings/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index 3fec9c4..0000000
Binary files a/overlay/packages/apps/Settings/res/mipmap-xxxhdpi/ic_foreground.png and /dev/null differ
diff --git a/product.mk b/product.mk
index 916969e..bfa87be 100644
--- a/product.mk
+++ b/product.mk
@@ -28,10 +28,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += lineage.updater.uri="https://updater.oddsol
 PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/certs/releasekey
 PRODUCT_VERITY_SIGNING_KEY := vendor/certs/verity
 
-## Themes
-DEVICE_PACKAGE_OVERLAYS += vendor/extra/overlay
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/extra/overlay
-
 EXCLUDE_GOOGLE_SERVICES_DEVICES += \
     %flo \
     %foster \