diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
index a503e5b..4957641 100644
--- a/packages/CMSettingsProvider/res/values/defaults.xml
+++ b/packages/CMSettingsProvider/res/values/defaults.xml
@@ -40,9 +40,13 @@
0
-
- wifi,bt,cell,airplane,rotation,flashlight,location,cast,hotspot,live_display
+
false
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
index c090b11..65ff3c0 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -249,7 +249,8 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
R.integer.def_force_show_navbar);
loadStringSetting(stmt, CMSettings.Secure.QS_TILES,
- R.string.def_qs_tiles);
+ org.cyanogenmod.platform.internal.
+ R.string.config_defaultQuickSettingsTiles);
loadBooleanSetting(stmt, CMSettings.Secure.QS_USE_MAIN_TILES,
R.bool.def_sysui_qs_main_tiles);
diff --git a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
index 0142b4f..b4fc655 100644
--- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
+++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
@@ -98,9 +98,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
SECURE_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.Secure.DEFAULT_THEME_PACKAGE,
"R.string.def_theme_package"));
- SECURE_SETTINGS_DEFAULTS.add(new Setting(
- CMSettings.Secure.QS_TILES,
- "R.string.def_qs_tiles"));
SECURE_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.Secure.PROTECTED_COMPONENT_MANAGERS,
"R.string.def_protected_component_managers"));