diff --git a/ParanoidGlyph/src/co/aospa/glyph/Settings/CallSettingsFragment.java b/ParanoidGlyph/src/co/aospa/glyph/Settings/CallSettingsFragment.java
index d4d3097..d58ec94 100644
--- a/ParanoidGlyph/src/co/aospa/glyph/Settings/CallSettingsFragment.java
+++ b/ParanoidGlyph/src/co/aospa/glyph/Settings/CallSettingsFragment.java
@@ -38,13 +38,10 @@ import co.aospa.glyph.Preference.GlyphAnimationPreference;
 import co.aospa.glyph.Utils.ResourceUtils;
 import co.aospa.glyph.Utils.ServiceUtils;
 
-public class CallSettingsFragment extends SettingsBasePreferenceFragment implements OnPreferenceChangeListener,
-        OnCheckedChangeListener {
+public class CallSettingsFragment extends SettingsBasePreferenceFragment implements OnPreferenceChangeListener {
 
     private PreferenceScreen mScreen;
 
-    private MainSwitchPreference mSwitchBar;
-
     private ListPreference mListPreference;
 
     private GlyphAnimationPreference mGlyphAnimationPreference;
@@ -58,9 +55,9 @@ public class CallSettingsFragment extends SettingsBasePreferenceFragment impleme
         mScreen = this.getPreferenceScreen();
         getActivity().setTitle(R.string.glyph_settings_call_toggle_title);
 
-        mSwitchBar = (MainSwitchPreference) findPreference(Constants.GLYPH_CALL_SUB_ENABLE);
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.setChecked(SettingsManager.isGlyphCallEnabled());
+        MainSwitchPreference switchBar = findPreference(Constants.GLYPH_CALL_SUB_ENABLE);
+        switchBar.setOnPreferenceChangeListener(this);
+        switchBar.setChecked(SettingsManager.isGlyphCallEnabled());
 
         mListPreference = (ListPreference) findPreference(Constants.GLYPH_CALL_SUB_ANIMATIONS);
         mListPreference.setOnPreferenceChangeListener(this);
@@ -84,6 +81,14 @@ public class CallSettingsFragment extends SettingsBasePreferenceFragment impleme
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final String preferenceKey = preference.getKey();
 
+        if (preferenceKey.equals(Constants.GLYPH_CALL_SUB_ENABLE)) {
+            boolean isChecked = (Boolean) newValue;
+            SettingsManager.setGlyphCallEnabled(isChecked);
+            ServiceUtils.checkGlyphService();
+            mGlyphAnimationPreference.updateAnimation(isChecked,
+                    SettingsManager.getGlyphCallAnimation());
+        }
+
         if (preferenceKey.equals(Constants.GLYPH_CALL_SUB_ANIMATIONS)) {
             mGlyphAnimationPreference.updateAnimation(SettingsManager.isGlyphCallEnabled(),
                 newValue.toString());
@@ -94,12 +99,4 @@ public class CallSettingsFragment extends SettingsBasePreferenceFragment impleme
         return true;
     }
 
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        SettingsManager.setGlyphCallEnabled(isChecked);
-        ServiceUtils.checkGlyphService();
-        mGlyphAnimationPreference.updateAnimation(isChecked,
-                SettingsManager.getGlyphCallAnimation());
-    }
-
 }
diff --git a/ParanoidGlyph/src/co/aospa/glyph/Settings/NotifsSettingsFragment.java b/ParanoidGlyph/src/co/aospa/glyph/Settings/NotifsSettingsFragment.java
index 0bd146b..68c6247 100644
--- a/ParanoidGlyph/src/co/aospa/glyph/Settings/NotifsSettingsFragment.java
+++ b/ParanoidGlyph/src/co/aospa/glyph/Settings/NotifsSettingsFragment.java
@@ -46,12 +46,10 @@ import co.aospa.glyph.Preference.GlyphAnimationPreference;
 import co.aospa.glyph.Utils.ResourceUtils;
 import co.aospa.glyph.Utils.ServiceUtils;
 
-public class NotifsSettingsFragment extends SettingsBasePreferenceFragment implements OnPreferenceChangeListener,
-        OnCheckedChangeListener {
+public class NotifsSettingsFragment extends SettingsBasePreferenceFragment implements OnPreferenceChangeListener {
 
     private PreferenceScreen mScreen;
 
-    private MainSwitchPreference mSwitchBar;
     private PreferenceCategory mCategory;
 
     private List<String> mEssentialApps = new ArrayList<String>();
@@ -73,9 +71,9 @@ public class NotifsSettingsFragment extends SettingsBasePreferenceFragment imple
         mScreen = this.getPreferenceScreen();
         getActivity().setTitle(R.string.glyph_settings_notifs_toggle_title);
 
-        mSwitchBar = (MainSwitchPreference) findPreference(Constants.GLYPH_NOTIFS_SUB_ENABLE);
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.setChecked(SettingsManager.isGlyphNotifsEnabled());
+        MainSwitchPreference switchBar = findPreference(Constants.GLYPH_NOTIFS_SUB_ENABLE);
+        switchBar.setOnPreferenceChangeListener(this);
+        switchBar.setChecked(SettingsManager.isGlyphNotifsEnabled());
 
         mCategory = (PreferenceCategory) findPreference(Constants.GLYPH_NOTIFS_SUB_CATEGORY);
 
@@ -125,6 +123,14 @@ public class NotifsSettingsFragment extends SettingsBasePreferenceFragment imple
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final String preferenceKey = preference.getKey();
 
+        if (preferenceKey.equals(Constants.GLYPH_NOTIFS_SUB_ENABLE)) {
+            boolean isChecked = (Boolean) newValue;
+            SettingsManager.setGlyphNotifsEnabled(isChecked);
+            ServiceUtils.checkGlyphService();
+            mGlyphAnimationPreference.updateAnimation(isChecked,
+                    SettingsManager.getGlyphNotifsAnimation(), 1500);
+        }
+
         if (preferenceKey.equals(Constants.GLYPH_NOTIFS_SUB_ANIMATIONS)) {
             mGlyphAnimationPreference.updateAnimation(SettingsManager.isGlyphNotifsEnabled(),
                 newValue.toString(), 1500);
@@ -139,12 +145,4 @@ public class NotifsSettingsFragment extends SettingsBasePreferenceFragment imple
         return true;
     }
 
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        SettingsManager.setGlyphNotifsEnabled(isChecked);
-        ServiceUtils.checkGlyphService();
-        mGlyphAnimationPreference.updateAnimation(isChecked,
-                SettingsManager.getGlyphNotifsAnimation(), 1500);
-    }
-
 }
diff --git a/ParanoidGlyph/src/co/aospa/glyph/Settings/SettingsFragment.java b/ParanoidGlyph/src/co/aospa/glyph/Settings/SettingsFragment.java
index 042e022..916486a 100644
--- a/ParanoidGlyph/src/co/aospa/glyph/Settings/SettingsFragment.java
+++ b/ParanoidGlyph/src/co/aospa/glyph/Settings/SettingsFragment.java
@@ -24,9 +24,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceCategory;
@@ -42,10 +39,7 @@ import co.aospa.glyph.Constants.Constants;
 import co.aospa.glyph.Manager.SettingsManager;
 import co.aospa.glyph.Utils.ServiceUtils;
 
-public class SettingsFragment extends SettingsBasePreferenceFragment implements OnPreferenceChangeListener,
-        OnCheckedChangeListener {
-
-    private MainSwitchPreference mSwitchBar;
+public class SettingsFragment extends SettingsBasePreferenceFragment implements OnPreferenceChangeListener {
 
     private SwitchPreferenceCompat mFlipPreference;
     private SeekBarPreference mBrightnessPreference;
@@ -71,9 +65,9 @@ public class SettingsFragment extends SettingsBasePreferenceFragment implements
 
         boolean glyphEnabled = SettingsManager.isGlyphEnabled();
 
-        mSwitchBar = (MainSwitchPreference) findPreference(Constants.GLYPH_ENABLE);
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.setChecked(glyphEnabled);
+        MainSwitchPreference switchBar = findPreference(Constants.GLYPH_ENABLE);
+        switchBar.setOnPreferenceChangeListener(this);
+        switchBar.setChecked(glyphEnabled);
 
         mFlipPreference = (SwitchPreferenceCompat) findPreference(Constants.GLYPH_FLIP_ENABLE);
         mFlipPreference.setEnabled(glyphEnabled);
@@ -133,6 +127,22 @@ public class SettingsFragment extends SettingsBasePreferenceFragment implements
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final String preferenceKey = preference.getKey();
 
+        if (preferenceKey.equals(Constants.GLYPH_ENABLE)) {
+            boolean isChecked = (Boolean) newValue;
+            SettingsManager.enableGlyph(isChecked);
+
+            mFlipPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mBrightnessPreference.setEnabled(isChecked);
+            mNotifsPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mNotifsPreference.setSwitchEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mCallPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mCallPreference.setSwitchEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mChargingLevelPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mChargingPowersharePreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mVolumeLevelPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
+            mMusicVisualizerPreference.setEnabled(isChecked);
+        }
+
         if (preferenceKey.equals(Constants.GLYPH_CALL_ENABLE)) {
             SettingsManager.setGlyphCallEnabled(!mCallPreference.isChecked());
         }
@@ -159,26 +169,6 @@ public class SettingsFragment extends SettingsBasePreferenceFragment implements
         return true;
     }
 
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        SettingsManager.enableGlyph(isChecked);
-
-        mSwitchBar.setChecked(isChecked);
-
-        mFlipPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mBrightnessPreference.setEnabled(isChecked);
-        mNotifsPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mNotifsPreference.setSwitchEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mCallPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mCallPreference.setSwitchEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mChargingLevelPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mChargingPowersharePreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mVolumeLevelPreference.setEnabled(isChecked && !mMusicVisualizerPreference.isChecked());
-        mMusicVisualizerPreference.setEnabled(isChecked);
-
-        mHandler.post(() -> ServiceUtils.checkGlyphService());
-    }
-
     @Override
     public void onDestroy() {
         mSettingObserver.unregister(mContentResolver);