diff --git a/res/drawable/ic_x.xml b/res/drawable/ic_x.xml
new file mode 100644
index 0000000..475ec9c
--- /dev/null
+++ b/res/drawable/ic_x.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="328.51"
+    android:viewportWidth="328.51" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M164.255,0C73.685,0 0,73.685 0,164.255S73.685,328.51 164.255,328.51S328.51,254.825 328.51,164.255S254.825,0 164.255,0zM164.255,313.51C81.955,313.51 15,246.555 15,164.255S81.955,15 164.255,15S313.51,81.955 313.51,164.255S246.555,313.51 164.255,313.51z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M229.044,88.858l-64.789,64.789l-64.789,-64.789l-10.608,10.608l64.789,64.789l-64.789,64.789l10.608,10.607l64.789,-64.789l64.789,64.789l10.607,-10.607l-64.789,-64.789l64.789,-64.789z"/>
+</vector>
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index 8fbb16e..8a65148 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -47,4 +47,8 @@
     <!-- Lockscreen battery info indicator  -->
     <string name="lockscreen_battery_info_title">Thông tin sạc màn hình khóa</string>
     <string name="lockscreen_battery_info_summary">Hiển thị dòng sạc tối đa của bộ sạc và điện áp và nhiệt độ pin trên màn hình khóa trong khi sạc</string>
+
+    <!-- QS category -->
+    <string name="enable_clear_all_button">Thay thế xóa tất cả văn bản bằng nút đẹp</string>
+    <string name="enable_clear_all_button_summary">Hiển thị xóa tất cả nút thông báo trong cài đặt nhanh thay vì văn bản mặc định</string>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index d8228ae..fdecba2 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -47,4 +47,8 @@
     <!-- Lockscreen battery info indicator  -->
     <string name="lockscreen_battery_info_title">Lockscreen charging info</string>
     <string name="lockscreen_battery_info_summary">Display negociated charger max current and voltage and battery temperature on lockscreen while charging</string>
+
+    <!-- QS category -->
+    <string name="enable_clear_all_button">Replace clear all text with nice button</string>
+    <string name="enable_clear_all_button_summary">Show clear all notifications button in quick settings instead of default text one</string>
 </resources>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index a1a82d8..8a541e2 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -18,4 +18,11 @@
     android:title="@string/quicksettings_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+      android:key="dismiss_all_button"
+	  android:icon="@drawable/ic_x"
+      android:title="@string/enable_clear_all_button"
+      android:summary="@string/enable_clear_all_button_summary"
+      android:defaultValue="false" />
+
 </PreferenceScreen>