diff --git a/res/drawable/preference_divider_dark.xml b/res/drawable/preference_divider_dark.xml
index 09a9f2470f..d0366796c4 100644
--- a/res/drawable/preference_divider_dark.xml
+++ b/res/drawable/preference_divider_dark.xml
@@ -4,14 +4,14 @@
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#101010" />
+            <solid android:color="@color/core_grey_95" />
         </shape>
     </item>
 
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#222222" />
+            <solid android:color="@color/core_grey_90" />
             <size android:height="20dp"/>
         </shape>
     </item>
diff --git a/res/drawable/preference_divider_light.xml b/res/drawable/preference_divider_light.xml
index a7ce0c1b96..1d1c33782a 100644
--- a/res/drawable/preference_divider_light.xml
+++ b/res/drawable/preference_divider_light.xml
@@ -4,14 +4,14 @@
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#d4d4d4" />
+            <solid android:color="@color/core_grey_05" />
         </shape>
     </item>
 
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#dddddd" />
+            <solid android:color="@color/core_grey_02" />
             <size android:height="20dp"/>
         </shape>
     </item>
diff --git a/res/layout/preference_divider.xml b/res/layout/preference_divider.xml
index 045cf65e49..0dee13ebaf 100644
--- a/res/layout/preference_divider.xml
+++ b/res/layout/preference_divider.xml
@@ -1,14 +1,4 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:layout_margin="0dp"
-              android:background="@color/amber_50"
-              android:padding="0dp">
-
-    <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:background="?pref_divider"/>
-
-</LinearLayout>
\ No newline at end of file
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="10dp"
+    android:background="?pref_divider" />
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 99c80bd66c..de1bddb27c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -283,6 +283,8 @@
 
 
     <style name="PreferenceThemeOverlay.Fix" parent="PreferenceThemeOverlay.v14.Material">
+        <item name="android:divider">@null</item>
+        <item name="android:dividerHeight">0dp</item>
     </style>
 
     <style name="Color1SwitchStyle">