diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 97136a0e..140e0f40 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -3,8 +3,7 @@ $(call inherit-product, vendor/lineage/config/common_full.mk)
 
 # Required packages
 PRODUCT_PACKAGES += \
-    LatinIME \
-    NavigationBarMode2ButtonOverlay
+    LatinIME
 
 # Include Lineage LatinIME dictionaries
 PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 9a98da19..e55a0466 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -53,7 +53,8 @@ PRODUCT_PACKAGES += \
     IconShapeTaperedRectOverlay \
     IconShapeTeardropOverlay \
     IconShapeVesselOverlay \
-    LineageNavigationBarNoHint
+    LineageNavigationBarNoHint \
+    NavigationBarMode2ButtonOverlay
 
 # Media
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \