diff --git a/overlays/overlay-theme/frameworks/base/core/res/res/values/config.xml b/overlays/overlay-theme/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index fe0d4e5..0000000
--- a/overlays/overlay-theme/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Use round icons -->
-    <bool name="config_useRoundIcon">true</bool>
-    <string name="config_icon_mask">M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z</string>
-
-    <!-- Google Sans font configuration -->
-    <string name="config_headlineFontFamily">google-sans</string>
-    <string name="config_headlineFontFamilyLight">google-sans</string>
-    <string name="config_headlineFontFeatureSettings">ss03</string>
-    <bool name="config_buttonTextAllCaps">false</bool>
-</resources>
diff --git a/overlays/overlay-theme/frameworks/base/core/res/res/values/dimens.xml b/overlays/overlay-theme/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index 6b5456c..0000000
--- a/overlays/overlay-theme/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="config_dialogCornerRadius">8.0dip</dimen>
-    <dimen name="config_buttonCornerRadius">4.0dip</dimen>
-    <dimen name="config_progressBarCornerRadius">1000.0dip</dimen>
-</resources>
diff --git a/overlays/overlay-theme/frameworks/base/core/res/res/values/donottranslate_material.xml b/overlays/overlay-theme/frameworks/base/core/res/res/values/donottranslate_material.xml
deleted file mode 100644
index 5f6839c..0000000
--- a/overlays/overlay-theme/frameworks/base/core/res/res/values/donottranslate_material.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="font_family_button_material">google-sans-medium</string>
-</resources>
diff --git a/overlays/overlay-theme/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlays/overlay-theme/frameworks/base/packages/SystemUI/res/values/dimens.xml
deleted file mode 100644
index 1f7c7d0..0000000
--- a/overlays/overlay-theme/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-     <dimen name="fingerprint_dialog_corner_size">8dp</dimen>
-     <dimen name="multi_user_switch_keyguard_margin">7dp</dimen>
-</resources>
diff --git a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-anydpi/ic_launcher.xml b/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-anydpi/ic_launcher.xml
deleted file mode 100644
index c6241fe..0000000
--- a/overlays/overlay-theme/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/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-hdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index 992c44e..0000000
Binary files a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-hdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-mdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index 4639ff0..0000000
Binary files a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-mdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xhdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index b992944..0000000
Binary files a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xxhdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index ae44b2f..0000000
Binary files a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xxxhdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index 85150eb..0000000
Binary files a/overlays/overlay-theme/packages/apps/DocumentsUI/res/mipmap-xxxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-anydpi/ic_launcher.xml b/overlays/overlay-theme/packages/apps/Settings/res/mipmap-anydpi/ic_launcher.xml
deleted file mode 100644
index c6241fe..0000000
--- a/overlays/overlay-theme/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/overlays/overlay-theme/packages/apps/Settings/res/mipmap-hdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/Settings/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index ddce98e..0000000
Binary files a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-hdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-mdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/Settings/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index 86f3be8..0000000
Binary files a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-mdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xhdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index 360aa69..0000000
Binary files a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xxhdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index 7cb67a9..0000000
Binary files a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xxxhdpi/ic_foreground.png b/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index 3fec9c4..0000000
Binary files a/overlays/overlay-theme/packages/apps/Settings/res/mipmap-xxxhdpi/ic_foreground.png and /dev/null differ
diff --git a/overlays/overlay-theme/packages/apps/Settings/res/values/styles.xml b/overlays/overlay-theme/packages/apps/Settings/res/values/styles.xml
deleted file mode 100644
index 3bd4315..0000000
--- a/overlays/overlay-theme/packages/apps/Settings/res/values/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <style name="TextAppearance.SearchBar" parent="@*android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
-        <item name="android:textSize">16dp</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:fontFamily">google-sans</item>
-    </style>
-</resources>
diff --git a/product.mk b/product.mk
index a2454c5..1b6f217 100644
--- a/product.mk
+++ b/product.mk
@@ -13,7 +13,6 @@ endif
 PRODUCT_PACKAGES += \
     PixelSetupWizardStringsOverlay
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/google_pixel/overlays/overlay-theme
 PRODUCT_PRODUCT_PROPERTIES += ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.boot.vendor.overlay.theme=com.android.internal.systemui.navbar.gestural;com.android.theme.icon.circle;org.lineageos.overlay.customization.navbar.nohint \