diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2c2dd28..c9ac1bb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,6 +55,7 @@
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
+            android:theme="@android:style/Theme.Holo.SolidActionBar.SplitActionBarWhenNarrow"
             android:hardwareAccelerated="true">
 
         <!-- Settings -->
@@ -62,7 +63,6 @@
         <activity android:name="Settings"
                 android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings"
-                android:theme="@android:style/Theme.Holo"
                 android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -73,8 +73,7 @@
         </activity>
 
         <activity android:name=".SubSettings"
-                android:taskAffinity="com.android.settings"
-                android:theme="@android:style/Theme.Holo">
+                android:taskAffinity="com.android.settings">
         </activity>
 
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
@@ -88,7 +87,6 @@
         <!-- Wireless Controls -->
 
         <activity android:name="Settings$WirelessSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/wireless_networks_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -107,7 +105,6 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
@@ -125,7 +122,6 @@
         </activity>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                  android:theme="@android:style/Theme.Holo"
                   android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -143,7 +139,6 @@
                   android:exported="true" />
 
         <activity android:name="Settings$AdvancedWifiSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/wifi_advanced_settings_label"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
@@ -217,7 +212,6 @@
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/bluetooth_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -259,7 +253,6 @@
         </activity>
 
         <activity android:name="Settings$TetherSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -293,7 +286,6 @@
         </activity-alias>
 
         <activity android:name="Settings$VpnSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/vpn_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -314,7 +306,6 @@
         </activity>
 
         <activity android:name="Settings$DateTimeSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/date_and_time">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -339,7 +330,6 @@
         </activity>
 
         <activity android:name="Settings$LocalePickerActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/language_picker_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -355,7 +345,6 @@
         </activity>
 
         <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/language_keyboard_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -373,7 +362,6 @@
         </activity>
 
         <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/input_methods_and_subtype_enabler_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -386,7 +374,6 @@
         </activity>
 
         <activity android:name=".inputmethod.InputMethodDialogActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -398,7 +385,6 @@
         </activity>
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/user_dict_settings_titlebar"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -420,7 +406,6 @@
         </activity>
 
         <activity android:name="Settings$SoundSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/sound_settings"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -438,7 +423,6 @@
         </activity>
 
         <activity android:name="Settings$DisplaySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/display_settings"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -456,7 +440,6 @@
         </activity>
 
         <activity android:name="Settings$DockSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/dock_settings_title"
                 android:enabled="@bool/has_dock_settings"
                 android:clearTaskOnLaunch="true">
@@ -508,7 +491,6 @@
         </activity>
 
         <activity android:name="Settings$ManageApplicationsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/manageapplications_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -554,7 +536,6 @@
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/runningservices_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -571,7 +552,6 @@
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$StorageUseActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/storageuse_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -588,7 +568,6 @@
         </activity>
 
         <activity android:name="Settings$LocationSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
@@ -607,7 +586,6 @@
         </activity>
 
         <activity android:name="Settings$SecuritySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
@@ -626,7 +604,6 @@
         </activity>
 
         <activity android:name="Settings$PrivacySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/privacy_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
@@ -656,7 +633,6 @@
 
         <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:theme="@android:style/Theme.Holo"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -696,7 +672,6 @@
         </activity>
 
         <activity android:name="Settings$AccessibilitySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/accessibility_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -760,7 +735,6 @@
         </activity>
 
         <activity android:name="Settings$StorageSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -819,7 +793,6 @@
         </activity>
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/development_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -846,7 +819,6 @@
         </activity-alias>
 
         <activity android:name="Settings$UsbSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/storage_title_usb"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -1074,7 +1046,6 @@
         </activity>
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/power_usage_summary_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1090,7 +1061,6 @@
 
         <activity
                 android:name="Settings$ManageAccountsSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/sync_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1104,8 +1074,7 @@
         </activity>
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
-            android:label="@string/account_sync_settings_title"
-            android:theme="@android:style/Theme.Holo">
+            android:label="@string/account_sync_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1159,7 +1128,6 @@
 
         <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
         <activity android:name="Settings$CryptKeeperSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index b982606..518d0ee 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -76,7 +76,6 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(android.R.style.Theme_Holo_SplitActionBarWhenNarrow);
         getMetaData();
         mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);