diff --git a/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml b/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml
new file mode 100644
index 00000000..6aeb54e1
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,3.19l7,3.11V11c0,4.52 -2.98,8.69 -7,9.93C7.98,19.69 5,15.52 5,11V6.3L12,3.19M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1L12,1zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml b/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml
new file mode 100644
index 00000000..694f0d45
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,1.85 -0.51,3.65 -1.38,5.21l-1.45,-1.45c1.29,-1.94 1.07,-4.58 -0.64,-6.29c-1.95,-1.95 -5.12,-1.95 -7.07,0c-1.95,1.95 -1.95,5.12 0,7.07c1.71,1.71 4.35,1.92 6.29,0.64l1.72,1.72c-1.19,1.42 -2.73,2.51 -4.47,3.04C7.98,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_privacy_policy_24dp.xml b/app/src/main/res/drawable/ic_outline_privacy_policy_24dp.xml
new file mode 100644
index 00000000..5521a149
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_privacy_policy_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12,3.19l7,3.11V11c0,4.52 -2.98,8.69 -7,9.93C7.98,19.69 5,15.52 5,11V6.3L12,3.19M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1L12,1zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_user_agreement_24dp.xml b/app/src/main/res/drawable/ic_outline_user_agreement_24dp.xml
new file mode 100644
index 00000000..da9a2872
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_user_agreement_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,1.85 -0.51,3.65 -1.38,5.21l-1.45,-1.45c1.29,-1.94 1.07,-4.58 -0.64,-6.29c-1.95,-1.95 -5.12,-1.95 -7.07,0c-1.95,1.95 -1.95,5.12 0,7.07c1.71,1.71 4.35,1.92 6.29,0.64l1.72,1.72c-1.19,1.42 -2.73,2.51 -4.47,3.04C7.98,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_customize_post_filter.xml b/app/src/main/res/layout/activity_customize_post_filter.xml
index 4f4695f0..e406cf39 100644
--- a/app/src/main/res/layout/activity_customize_post_filter.xml
+++ b/app/src/main/res/layout/activity_customize_post_filter.xml
@@ -59,7 +59,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/post_filter_name_hint" />
+                    android:hint="@string/post_filter_name_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -319,7 +320,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/title_excludes_strings_hint" />
+                    android:hint="@string/title_excludes_strings_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -339,7 +341,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/title_contains_strings_hint" />
+                    android:hint="@string/title_contains_strings_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -359,7 +362,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/title_excludes_regex_hint" />
+                    android:hint="@string/title_excludes_regex_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -379,7 +383,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/title_contains_regex_hint" />
+                    android:hint="@string/title_contains_regex_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -404,7 +409,8 @@
                         android:layout_weight="1"
                         android:fontFamily="?attr/font_family"
                         android:textSize="?attr/font_default"
-                        android:hint="@string/exclude_subreddits_hint" />
+                        android:hint="@string/exclude_subreddits_hint"
+                        android:maxLines="10" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -440,7 +446,8 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="?attr/font_family"
                         android:textSize="?attr/font_default"
-                        android:hint="@string/exclude_users_hint" />
+                        android:hint="@string/exclude_users_hint"
+                        android:maxLines="10" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -472,7 +479,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/exclude_flairs_hint" />
+                    android:hint="@string/exclude_flairs_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -492,7 +500,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/contain_flairs_hint" />
+                    android:hint="@string/contain_flairs_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -512,7 +521,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/exclude_domains_hint" />
+                    android:hint="@string/exclude_domains_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -532,7 +542,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/contain_domains_hint" />
+                    android:hint="@string/contain_domains_hint"
+                    android:maxLines="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -553,7 +564,8 @@
                     android:inputType="numberSigned"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/min_vote_hint" />
+                    android:hint="@string/min_vote_hint"
+                    android:maxLines="1" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -574,7 +586,8 @@
                     android:inputType="numberSigned"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/max_vote_hint" />
+                    android:hint="@string/max_vote_hint"
+                    android:maxLines="1" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -595,7 +608,8 @@
                     android:inputType="numberSigned"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/min_comments_hint" />
+                    android:hint="@string/min_comments_hint"
+                    android:maxLines="1" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -616,7 +630,8 @@
                     android:inputType="numberSigned"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/max_comments_hint" />
+                    android:hint="@string/max_comments_hint"
+                    android:maxLines="1" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -637,7 +652,8 @@
                     android:inputType="numberSigned"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/min_awards_hint" />
+                    android:hint="@string/min_awards_hint"
+                    android:maxLines="1" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -658,7 +674,8 @@
                     android:inputType="numberSigned"
                     android:fontFamily="?attr/font_family"
                     android:textSize="?attr/font_default"
-                    android:hint="@string/max_awards_hint" />
+                    android:hint="@string/max_awards_hint"
+                    android:maxLines="1" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/preference_switch.xml b/app/src/main/res/layout/preference_switch.xml
new file mode 100644
index 00000000..04934b5b
--- /dev/null
+++ b/app/src/main/res/layout/preference_switch.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/material_switch_switch_preference"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 107e9e52..d7433851 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -89,10 +89,12 @@
 
     <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference
         android:key="privacy_policy"
+        app:icon="@drawable/ic_outline_privacy_policy_24dp"
         app:title="@string/settings_privacy_policy_title" />
 
     <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference
         android:key="reddit_user_agreement"
+        app:icon="@drawable/ic_outline_user_agreement_24dp"
         app:title="@string/settings_reddit_user_agreement_title" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file