diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index 00e95a8fa132b60f19aa0b22334c5792cc5ed877..c84e725086d89051fcf847c2ad9c06052350f569 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -69,6 +69,9 @@
     <!-- Screen pinning dialog description (for devices without navbar) -->
     <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch &amp; hold Back to unpin.</string>
 
+    <!-- Name of the clock status bar icon -->
+    <string name="status_bar_clock">Clock</string>
+
     <!-- Text to use when the number in a notification info is too large
          (greater than status_bar_notification_info_maxnum, defined in
          values/config.xml) and must be truncated.
diff --git a/packages/SystemUI/res/xml/status_bar_prefs.xml b/packages/SystemUI/res/xml/status_bar_prefs.xml
index bae146d43042602d1f2b257ec17318f380f60fd3..754eb4cb1b0b7f4601e2158a2fa12f13b73bce73 100644
--- a/packages/SystemUI/res/xml/status_bar_prefs.xml
+++ b/packages/SystemUI/res/xml/status_bar_prefs.xml
@@ -89,9 +89,8 @@
 
     <!-- secure -->
 
-    <com.android.systemui.tuner.ClockPreference
-        android:title="@string/tuner_time"
-        android:summary="%s"
-        android:entries="@array/clock_options" />
+    <com.android.systemui.tuner.StatusBarSwitch
+        android:key="clock"
+        android:title="@string/status_bar_clock" />
 
 </PreferenceScreen>