diff --git a/overlay/fonts/Android.mk b/overlay/fonts/Android.mk
index 57599d6..e69de29 100644
--- a/overlay/fonts/Android.mk
+++ b/overlay/fonts/Android.mk
@@ -1,3 +0,0 @@
-# Fonts
-PRODUCT_COPY_FILES += \
-    $(call find-copy-subdir-files,*,vendor/custom/fonts/fonts/,$(TARGET_COPY_OUT_PRODUCT)/fonts)
diff --git a/prebuilts/prebuilts.mk b/prebuilts/prebuilts.mk
index 6c13e50..fcd1cd9 100644
--- a/prebuilts/prebuilts.mk
+++ b/prebuilts/prebuilts.mk
@@ -1,4 +1,8 @@
 
 PRODUCT_PACKAGES +=\
     wg \
-    wg-quick
\ No newline at end of file
+    wg-quick
+
+# Fonts
+PRODUCT_COPY_FILES += \
+    $(call find-copy-subdir-files,*,vendor/custom/prebuilts/product/fonts/,$(TARGET_COPY_OUT_PRODUCT)/fonts)
diff --git a/overlay/fonts/fonts/LXGWWenKai-Light.ttf b/prebuilts/product/fonts/LXGWWenKai-Light.ttf
similarity index 100%
rename from overlay/fonts/fonts/LXGWWenKai-Light.ttf
rename to prebuilts/product/fonts/LXGWWenKai-Light.ttf
diff --git a/overlay/fonts/fonts/LXGWWenKai-Medium.ttf b/prebuilts/product/fonts/LXGWWenKai-Medium.ttf
similarity index 100%
rename from overlay/fonts/fonts/LXGWWenKai-Medium.ttf
rename to prebuilts/product/fonts/LXGWWenKai-Medium.ttf
diff --git a/overlay/fonts/fonts/LXGWWenKai-Regular.ttf b/prebuilts/product/fonts/LXGWWenKai-Regular.ttf
similarity index 100%
rename from overlay/fonts/fonts/LXGWWenKai-Regular.ttf
rename to prebuilts/product/fonts/LXGWWenKai-Regular.ttf
diff --git a/overlay/fonts/fonts/LXGWWenKaiMono-Light.ttf b/prebuilts/product/fonts/LXGWWenKaiMono-Light.ttf
similarity index 100%
rename from overlay/fonts/fonts/LXGWWenKaiMono-Light.ttf
rename to prebuilts/product/fonts/LXGWWenKaiMono-Light.ttf
diff --git a/overlay/fonts/fonts/LXGWWenKaiMono-Medium.ttf b/prebuilts/product/fonts/LXGWWenKaiMono-Medium.ttf
similarity index 100%
rename from overlay/fonts/fonts/LXGWWenKaiMono-Medium.ttf
rename to prebuilts/product/fonts/LXGWWenKaiMono-Medium.ttf
diff --git a/overlay/fonts/fonts/LXGWWenKaiMono-Regular.ttf b/prebuilts/product/fonts/LXGWWenKaiMono-Regular.ttf
similarity index 100%
rename from overlay/fonts/fonts/LXGWWenKaiMono-Regular.ttf
rename to prebuilts/product/fonts/LXGWWenKaiMono-Regular.ttf