diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 685dee5c7f5..76776cd125c 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -368,7 +368,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         super.onActivityCreated(savedInstanceState);
 
         final Activity activity = getActivity();
-        mEnabledSwitch = new Switch(activity);
+        mEnabledSwitch = new Switch(activity.getActionBar().getThemedContext());
 
         final int padding = activity.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 1575bee9b6b..41cd75d6b5b 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -86,7 +86,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
         final Activity activity = getActivity();
 
         mBackend = new DreamBackend(activity);
-        mSwitch = new Switch(activity);
+        mSwitch = new Switch(activity.getActionBar().getThemedContext());
         mSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
diff --git a/src/com/android/settings/ZenModeSettings.java b/src/com/android/settings/ZenModeSettings.java
index 51b43fd7963..f6c7b8c5c70 100644
--- a/src/com/android/settings/ZenModeSettings.java
+++ b/src/com/android/settings/ZenModeSettings.java
@@ -67,7 +67,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mActivity = getActivity();
-        mSwitch = new Switch(mActivity);
+        mSwitch = new Switch(mActivity.getActionBar().getThemedContext());
         final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
         mSwitch.setPadding(0, 0, p, 0);
         setHasOptionsMenu(true);
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index b707e7b12f1..b505a3fe303 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -117,7 +117,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
         final Activity activity = getActivity();
         final int padding = activity.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
-        mSwitch = new Switch(activity);
+        mSwitch = new Switch(activity.getActionBar().getThemedContext());
         mSwitch.setPaddingRelative(0, 0, padding, 0);
 
         mBluetoothEnabler = new BluetoothEnabler(activity, mSwitch);
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index d862fd79c3a..1549bbd3ede 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -73,7 +73,7 @@ public class LocationSettings extends LocationSettingsBase
 
         final Activity activity = getActivity();
 
-        mSwitch = new Switch(activity);
+        mSwitch = new Switch(activity.getActionBar().getThemedContext());
         final int padding = activity.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
         mSwitch.setPaddingRelative(0, 0, padding, 0);
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index b3cd9c24e22..f289550ff4d 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -42,7 +42,7 @@ public class AndroidBeam extends Fragment
         super.onCreate(savedInstanceState);
         Activity activity = getActivity();
 
-        mActionBarSwitch = new Switch(activity);
+        mActionBarSwitch = new Switch(activity.getActionBar().getThemedContext());
 
         if (activity instanceof SettingsActivity) {
             final int padding = activity.getResources().getDimensionPixelSize(
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 3bba96359a9..0d7444a8a0a 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -294,7 +294,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         mPrintersAdapter = new PrintersAdapter();
         mPrintersAdapter.registerDataSetObserver(mDataObserver);
 
-        mToggleSwitch = createActionBarToggleSwitch(getActivity());
+        mToggleSwitch = createActionBarToggleSwitch(getActivity().getActionBar().getThemedContext());
         mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
             @Override
             public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
@@ -445,9 +445,9 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         }
     }
 
-    private ToggleSwitch createActionBarToggleSwitch(Activity activity) {
-        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
-        final int padding = activity.getResources().getDimensionPixelSize(
+    private ToggleSwitch createActionBarToggleSwitch(Context context) {
+        ToggleSwitch toggleSwitch = new ToggleSwitch(context);
+        final int padding = context.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
         toggleSwitch.setPaddingRelative(0, 0, padding, 0);
         return toggleSwitch;
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 0215ad86396..2f8d22b61c2 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -50,7 +50,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -72,8 +71,6 @@ import java.util.List;
 public class PrintSettingsFragment extends SettingsPreferenceFragment
         implements DialogCreatable, Indexable {
 
-    static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
-
     private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
 
     private static final String PRINT_JOBS_CATEGORY = "print_jobs_category";