diff --git a/app/app.iml b/app/app.iml
index c452ceed..c8002dfb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -91,10 +91,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/preference-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.h6ah4i.android.compat/mulsellistprefcompat/1.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@@ -114,8 +112,6 @@
     <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="mulsellistprefcompat-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
-    <orderEntry type="library" exported="" name="preference-v7-23.1.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0c990ba2..eeb343fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.1.+'
     compile 'com.android.support:recyclerview-v7:23.1.+'
-    compile 'com.android.support:preference-v7:23.1.+'
-    compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0' // Google come on ...
     compile 'com.squareup.picasso:picasso:2.5.+'
 }
diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
index 69f31c64..a3601777 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
@@ -101,7 +101,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
     protected void onCreate(Bundle savedInstanceState) {
         Util.setTheme(this);
         super.onCreate(savedInstanceState);
-        getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new FragmentSettings()).commit();
+        getFragmentManager().beginTransaction().replace(android.R.id.content, new FragmentSettings()).commit();
         getSupportActionBar().setTitle(R.string.menu_settings);
     }
 
diff --git a/app/src/main/java/eu/faircode/netguard/FragmentSettings.java b/app/src/main/java/eu/faircode/netguard/FragmentSettings.java
index e3b53954..354fcf83 100644
--- a/app/src/main/java/eu/faircode/netguard/FragmentSettings.java
+++ b/app/src/main/java/eu/faircode/netguard/FragmentSettings.java
@@ -20,16 +20,13 @@ package eu.faircode.netguard;
 */
 
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import android.preference.PreferenceFragment;
+
+public class FragmentSettings extends PreferenceFragment {
 
-public class FragmentSettings extends PreferenceFragmentCompat {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onCreatePreferences(Bundle bundle, String s) {
         addPreferencesFromResource(R.xml.preferences);
     }
 }
diff --git a/app/src/main/java/eu/faircode/netguard/SwitchPreference.java b/app/src/main/java/eu/faircode/netguard/SwitchPreference.java
index ab6de01d..e37c2bfb 100644
--- a/app/src/main/java/eu/faircode/netguard/SwitchPreference.java
+++ b/app/src/main/java/eu/faircode/netguard/SwitchPreference.java
@@ -20,12 +20,11 @@ package eu.faircode.netguard;
 */
 
 import android.content.Context;
-import android.support.v7.preference.SwitchPreferenceCompat;
 import android.util.AttributeSet;
 
 // https://code.google.com/p/android/issues/detail?id=26194
 
-public class SwitchPreference extends SwitchPreferenceCompat {
+public class SwitchPreference extends android.preference.SwitchPreference {
     public SwitchPreference(Context context) {
         this(context, null);
     }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 573cf86f..dcc201e1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,12 +5,10 @@
 
     <style name="BaseThemeDark" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowDisablePreview">true</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="BaseThemeLight" parent="Theme.AppCompat">
         <item name="android:windowDisablePreview">true</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="AppThemeTeal" parent="BaseThemeDark">
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 04f0c578..5acae717 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -56,7 +56,7 @@
             android:defaultValue="false"
             android:key="tethering"
             android:title="@string/setting_tethering" />
-        <com.h6ah4i.android.compat.preference.MultiSelectListPreferenceCompat
+        <MultiSelectListPreference
             android:defaultValue="@array/default_wifi_home"
             android:key="wifi_homes"
             android:summary="@string/summary_wifi_home" />