diff --git a/Picker/src/me/phh/treble/overlaypicker/Starter.java b/Picker/src/me/phh/treble/overlaypicker/Starter.java
index ecd39f1..a738cac 100644
--- a/Picker/src/me/phh/treble/overlaypicker/Starter.java
+++ b/Picker/src/me/phh/treble/overlaypicker/Starter.java
@@ -44,6 +44,18 @@
 			setOverlayEnabled("me.phh.treble.overlay.essential_ph1", true);
 	}
 
+	private void handleSamsung(Context ctxt) {
+		if(vendorFp == null) return;
+
+		if(vendorFp.contains("starlte") ||
+		   vendorFp.contains("star2lte") ||
+		   vendorFp.contains("starqlte") ||
+		   vendorFp.contains("star2qlte")) {
+			setOverlayEnabled("me.phh.treble.overlay.samsung.s9.systemui", true);
+		}
+
+	}
+
 	private void enableLte(Context ctxt) {
 		//TODO: List here all non-LTE platforms
 		if(!"mt6580".equals(platform))
@@ -59,6 +71,7 @@
 		handleNightmode(ctxt);
 		handleEssentialPh1(ctxt);
 		enableLte(ctxt);
+		handleSamsung(ctxt);
 
 		setOverlayEnabled("me.phh.treble.overlay.systemui.falselocks", true);
 	}
diff --git a/Samsung/S9/SystemUI/Android.mk b/Samsung/S9/SystemUI/Android.mk
new file mode 100644
index 0000000..6924df1
--- /dev/null
+++ b/Samsung/S9/SystemUI/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-samsung-s9-systemui
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Samsung/S9/SystemUI/AndroidManifest.xml b/Samsung/S9/SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..a96f3e0
--- /dev/null
+++ b/Samsung/S9/SystemUI/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.samsung.s9.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:priority="23"/>
+</manifest>
diff --git a/Samsung/S9/SystemUI/res/values-sw372dp/config.xml b/Samsung/S9/SystemUI/res/values-sw372dp/config.xml
new file mode 100644
index 0000000..edb7e9c
--- /dev/null
+++ b/Samsung/S9/SystemUI/res/values-sw372dp/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="rounded_corner_content_padding">64px</dimen>
+</resources>
diff --git a/Samsung/S9/SystemUI/res/values/config.xml b/Samsung/S9/SystemUI/res/values/config.xml
new file mode 100644
index 0000000..edb7e9c
--- /dev/null
+++ b/Samsung/S9/SystemUI/res/values/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="rounded_corner_content_padding">64px</dimen>
+</resources>
diff --git a/overlay.mk b/overlay.mk
index 09cf080..af47d53 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -16,7 +16,7 @@
 	treble-overlay-oneplus-op6 \
 	treble-overlay-moto-g6plus \
 	treble-overlay-wifi5g \
-	treble-overlay-samsung-s9 \
+	treble-overlay-samsung-s9-systemui \
 	treble-overlay-xiaomi-mi8 \
 	treble-overlay-xiaomi-mi8ee \
 	treble-overlay-xiaomi-mi8se \