diff --git a/overlay/packages/Android.mk b/overlay/packages/Android.mk
index 2e0f9fed..00ff6127 100644
--- a/overlay/packages/Android.mk
+++ b/overlay/packages/Android.mk
@@ -19,7 +19,8 @@ LOCAL_MODULE := pa-overlays
 LOCAL_REQUIRED_MODULES := \
     AccentColorPixelBlueOverlay \
     AccentColorTealOverlay \
-	FontGoogleSansOverlay
+    FontGoogleSansOverlay \
+    FontSlateForOnePlusOverlay
 
 include $(BUILD_PHONY_PACKAGE)
-include $(call first-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/overlay/packages/FontSlateForOnePlusOverlay/Android.mk b/overlay/packages/FontSlateForOnePlusOverlay/Android.mk
new file mode 100644
index 00000000..4f5e2df9
--- /dev/null
+++ b/overlay/packages/FontSlateForOnePlusOverlay/Android.mk
@@ -0,0 +1,31 @@
+#
+#  Copyright 2019, 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_RRO_THEME := FontSlateForOnePlus
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := FontSlateForOnePlusOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/overlay/packages/FontSlateForOnePlusOverlay/AndroidManifest.xml b/overlay/packages/FontSlateForOnePlusOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..ba93e35e
--- /dev/null
+++ b/overlay/packages/FontSlateForOnePlusOverlay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.theme.font.slateforoneplus"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android"
+        android:category="android.theme.customization.font"
+        android:priority="1"/>
+
+    <application android:label="@string/font_slate_for_oneplus_overlay" android:hasCode="false">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="Slate,Slate-book,slate-medium" />
+    </application>
+</manifest>
diff --git a/overlay/packages/FontSlateForOnePlusOverlay/res/values/config.xml b/overlay/packages/FontSlateForOnePlusOverlay/res/values/config.xml
new file mode 100644
index 00000000..6a5c8755
--- /dev/null
+++ b/overlay/packages/FontSlateForOnePlusOverlay/res/values/config.xml
@@ -0,0 +1,31 @@
+<!--
+/**
+ * Copyright (c) 2019, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily">Slate</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium">Slate-medium</string>
+
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily">Slate-book</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium">Slate</string>
+</resources>
+
diff --git a/overlay/packages/FontSlateForOnePlusOverlay/res/values/strings.xml b/overlay/packages/FontSlateForOnePlusOverlay/res/values/strings.xml
new file mode 100644
index 00000000..fc6045cf
--- /dev/null
+++ b/overlay/packages/FontSlateForOnePlusOverlay/res/values/strings.xml
@@ -0,0 +1,21 @@
+<!--
+/**
+ * Copyright (c) 2019, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- OnePlus Slate font name -->
+    <string name="font_slate_for_oneplus_overlay" translatable="false">Slate For OnePlus</string>
+</resources>
diff --git a/prebuilt/etc/fonts_customization.xml b/prebuilt/etc/fonts_customization.xml
index db229423..c90581d6 100644
--- a/prebuilt/etc/fonts_customization.xml
+++ b/prebuilt/etc/fonts_customization.xml
@@ -8,4 +8,16 @@
         <font weight="700" style="italic">GoogleSans-BoldItalic.ttf</font>
     </family>
     <alias name="google-sans-medium" to="google-sans" weight="500" />
-</fonts-modification>
\ No newline at end of file
+
+    <family customizationType="new-named-family" name="Slate">
+        <font weight="300" style="normal">SlateForOnePlus-Book.ttf</font>
+        <font weight="300" style="italic">Roboto-LightItalic.ttf</font>
+        <font weight="400" style="normal">SlateForOnePlus-Regular.ttf</font>
+        <font weight="400" style="italic">Roboto-Italic.ttf</font>
+        <font weight="500" style="normal">SlateForOnePlus-Medium.ttf</font>
+        <font weight="500" style="italic">Roboto-MediumItalic.ttf</font>
+    </family>
+    <alias name="Slate" to="Slate" weight="400"/>
+    <alias name="Slate-book" to="Slate" weight="300" />
+    <alias name="Slate-medium" to="Slate" weight="500" />
+</fonts-modification>
diff --git a/prebuilt/fonts/SlateForOnePlus-Book.ttf b/prebuilt/fonts/SlateForOnePlus-Book.ttf
new file mode 100644
index 00000000..f399e030
Binary files /dev/null and b/prebuilt/fonts/SlateForOnePlus-Book.ttf differ
diff --git a/prebuilt/fonts/SlateForOnePlus-Medium.ttf b/prebuilt/fonts/SlateForOnePlus-Medium.ttf
new file mode 100644
index 00000000..0deaf0e7
Binary files /dev/null and b/prebuilt/fonts/SlateForOnePlus-Medium.ttf differ
diff --git a/prebuilt/fonts/SlateForOnePlus-Regular.ttf b/prebuilt/fonts/SlateForOnePlus-Regular.ttf
new file mode 100644
index 00000000..e8c4ce9f
Binary files /dev/null and b/prebuilt/fonts/SlateForOnePlus-Regular.ttf differ