diff --git a/caiman/overlay_packages/SettingsCaimanOverlay/Android.bp b/caiman/overlay_packages/SettingsCaimanOverlay/Android.bp
new file mode 100644
index 00000000..77dd99a6
--- /dev/null
+++ b/caiman/overlay_packages/SettingsCaimanOverlay/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2024 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsCaimanOverlay",
+    product_specific: true,
+}
diff --git a/caiman/overlay_packages/SettingsCaimanOverlay/AndroidManifest.xml b/caiman/overlay_packages/SettingsCaimanOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..1a85a34a
--- /dev/null
+++ b/caiman/overlay_packages/SettingsCaimanOverlay/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.caiman">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true" />
+</manifest>
diff --git a/caiman/overlay_packages/SettingsCaimanOverlay/res/drawable/regulatory_info_s1108s_cn.png b/caiman/overlay_packages/SettingsCaimanOverlay/res/drawable/regulatory_info_s1108s_cn.png
new file mode 100644
index 00000000..35a6f79e
Binary files /dev/null and b/caiman/overlay_packages/SettingsCaimanOverlay/res/drawable/regulatory_info_s1108s_cn.png differ
diff --git a/caiman/overlay_packages/SettingsCaimanOverlay/res/values/config.xml b/caiman/overlay_packages/SettingsCaimanOverlay/res/values/config.xml
new file mode 100644
index 00000000..eeeb532c
--- /dev/null
+++ b/caiman/overlay_packages/SettingsCaimanOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 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>
+    <string name="config_regulatory_info_overlay_package_name" translatable="false">com.android.settings.caiman</string>
+</resources>
diff --git a/device-caiman.mk b/device-caiman.mk
index dd770c9c..4de69ebb 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -219,6 +219,10 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_PACKAGES += \
     WifiOverlay2024
 
+# Settings Overlay
+PRODUCT_PACKAGES += \
+    SettingsCaimanOverlay
+
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
diff --git a/device-komodo.mk b/device-komodo.mk
index b576d7b7..10df6b37 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -237,6 +237,10 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_PACKAGES += \
     WifiOverlay2024
 
+# Settings Overlay
+PRODUCT_PACKAGES += \
+    SettingsKomodoOverlay
+
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
diff --git a/device-tokay.mk b/device-tokay.mk
index 0e2ce46f..75283929 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -213,6 +213,10 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_PACKAGES += \
     WifiOverlay2024
 
+# Settings Overlay
+PRODUCT_PACKAGES += \
+    SettingsTokayOverlay
+
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
diff --git a/komodo/overlay_packages/SettingsKomodoOverlay/Android.bp b/komodo/overlay_packages/SettingsKomodoOverlay/Android.bp
new file mode 100644
index 00000000..a2c689cf
--- /dev/null
+++ b/komodo/overlay_packages/SettingsKomodoOverlay/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2024 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsKomodoOverlay",
+    product_specific: true,
+}
diff --git a/komodo/overlay_packages/SettingsKomodoOverlay/AndroidManifest.xml b/komodo/overlay_packages/SettingsKomodoOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..d3996d47
--- /dev/null
+++ b/komodo/overlay_packages/SettingsKomodoOverlay/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.komodo">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true" />
+</manifest>
diff --git a/komodo/overlay_packages/SettingsKomodoOverlay/res/drawable/regulatory_info_c1204i_cn.png b/komodo/overlay_packages/SettingsKomodoOverlay/res/drawable/regulatory_info_c1204i_cn.png
new file mode 100644
index 00000000..bbd32cf1
Binary files /dev/null and b/komodo/overlay_packages/SettingsKomodoOverlay/res/drawable/regulatory_info_c1204i_cn.png differ
diff --git a/komodo/overlay_packages/SettingsKomodoOverlay/res/values/config.xml b/komodo/overlay_packages/SettingsKomodoOverlay/res/values/config.xml
new file mode 100644
index 00000000..a35581a4
--- /dev/null
+++ b/komodo/overlay_packages/SettingsKomodoOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 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>
+    <string name="config_regulatory_info_overlay_package_name" translatable="false">com.android.settings.komodo</string>
+</resources>
diff --git a/tokay/overlay_packages/SettingsTokayOverlay/Android.bp b/tokay/overlay_packages/SettingsTokayOverlay/Android.bp
new file mode 100644
index 00000000..5d075c86
--- /dev/null
+++ b/tokay/overlay_packages/SettingsTokayOverlay/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2024 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsTokayOverlay",
+    product_specific: true,
+}
diff --git a/tokay/overlay_packages/SettingsTokayOverlay/AndroidManifest.xml b/tokay/overlay_packages/SettingsTokayOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..a48c706b
--- /dev/null
+++ b/tokay/overlay_packages/SettingsTokayOverlay/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.tokay">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true" />
+</manifest>
diff --git a/tokay/overlay_packages/SettingsTokayOverlay/res/drawable/regulatory_info_j1026q_cn.png b/tokay/overlay_packages/SettingsTokayOverlay/res/drawable/regulatory_info_j1026q_cn.png
new file mode 100644
index 00000000..e82efd25
Binary files /dev/null and b/tokay/overlay_packages/SettingsTokayOverlay/res/drawable/regulatory_info_j1026q_cn.png differ
diff --git a/tokay/overlay_packages/SettingsTokayOverlay/res/values/config.xml b/tokay/overlay_packages/SettingsTokayOverlay/res/values/config.xml
new file mode 100644
index 00000000..edb13785
--- /dev/null
+++ b/tokay/overlay_packages/SettingsTokayOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 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>
+    <string name="config_regulatory_info_overlay_package_name" translatable="false">com.android.settings.tokay</string>
+</resources>