diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml
index 2afd39800..d726e26b7 100644
--- a/app/src/main/res/xml/appearance_settings.xml
+++ b/app/src/main/res/xml/appearance_settings.xml
@@ -8,10 +8,10 @@
         android:entries="@array/theme_description_list"
         android:entryValues="@array/theme_values_list"
         android:key="@string/theme_key"
-        android:summary="%s"
         android:title="@string/theme_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/default_night_theme_value"
@@ -44,20 +44,20 @@
         android:entries="@array/tablet_mode_description"
         android:entryValues="@array/tablet_mode_values"
         android:key="@string/tablet_mode_key"
-        android:summary="%s"
         android:title="@string/tablet_mode_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/list_view_mode_value"
         android:entries="@array/list_view_mode_description"
         android:entryValues="@array/list_view_mode_values"
         android:key="@string/list_view_mode_key"
-        android:summary="%s"
         android:title="@string/list_view_mode"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <Preference
         android:key="@string/caption_settings_key"
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index e754b3a30..fddb966c8 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -8,30 +8,30 @@
         android:entries="@array/app_language_name"
         android:entryValues="@array/app_language_code"
         android:key="@string/app_language_key"
-        android:summary="%s"
         android:title="@string/app_language_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/default_localization_key"
         android:entries="@array/language_names"
         android:entryValues="@array/language_codes"
         android:key="@string/content_language_key"
-        android:summary="%s"
         android:title="@string/content_language_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/default_localization_key"
         android:entries="@array/country_names"
         android:entryValues="@array/country_codes"
         android:key="@string/content_country_key"
-        android:summary="%s"
         android:title="@string/default_content_country_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <PreferenceScreen
         android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index 48e7bbd2e..27513d259 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -40,10 +40,10 @@
         android:entries="@array/settings_filename_charset_name"
         android:entryValues="@array/settings_filename_charset"
         android:key="@string/settings_file_charset_key"
-        android:summary="%s"
         android:title="@string/settings_file_charset_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue="@string/settings_file_replacement_character_default_value"
diff --git a/app/src/main/res/xml/notifications_settings.xml b/app/src/main/res/xml/notifications_settings.xml
index 5ea410846..5e2858c9e 100644
--- a/app/src/main/res/xml/notifications_settings.xml
+++ b/app/src/main/res/xml/notifications_settings.xml
@@ -18,10 +18,10 @@
 		android:entries="@array/streams_notifications_interval_description"
 		android:entryValues="@array/streams_notifications_interval_values"
 		android:key="@string/streams_notifications_interval_key"
-		android:summary="%s"
 		android:title="@string/streams_notifications_interval_title"
 		app:singleLineTitle="false"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:useSimpleSummaryProvider="true" />
 
 	<ListPreference
 		android:defaultValue="@string/streams_notifications_network_default"
@@ -29,10 +29,10 @@
 		android:entries="@array/streams_notifications_network_description"
 		android:entryValues="@array/streams_notifications_network_values"
 		android:key="@string/streams_notifications_network_key"
-		android:summary="%s"
 		android:title="@string/streams_notifications_network_title"
 		app:singleLineTitle="false"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:useSimpleSummaryProvider="true" />
 
 	<Preference
 		android:fragment="org.schabi.newpipe.settings.notifications.NotificationModeConfigFragment"
diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml
index 69013ae4b..8ff91548d 100644
--- a/app/src/main/res/xml/video_audio_settings.xml
+++ b/app/src/main/res/xml/video_audio_settings.xml
@@ -8,30 +8,30 @@
         android:entries="@array/resolution_list_description"
         android:entryValues="@array/resolution_list_values"
         android:key="@string/default_resolution_key"
-        android:summary="%s"
         android:title="@string/default_resolution_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/default_popup_resolution_value"
         android:entries="@array/resolution_list_description"
         android:entryValues="@array/resolution_list_values"
         android:key="@string/default_popup_resolution_key"
-        android:summary="%s"
         android:title="@string/default_popup_resolution_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/limit_mobile_data_usage_value"
         android:entries="@array/limit_data_usage_description_list"
         android:entryValues="@array/limit_data_usage_values_list"
         android:key="@string/limit_mobile_data_usage_key"
-        android:summary="%s"
         android:title="@string/limit_mobile_data_usage_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
@@ -46,20 +46,20 @@
         android:entries="@array/video_format_description_list"
         android:entryValues="@array/video_format_values_list"
         android:key="@string/default_video_format_key"
-        android:summary="%s"
         android:title="@string/default_video_format_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/default_audio_format_value"
         android:entries="@array/audio_format_description_list"
         android:entryValues="@array/audio_format_values_list"
         android:key="@string/default_audio_format_key"
-        android:summary="%s"
         android:title="@string/default_audio_format_title"
         app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:useSimpleSummaryProvider="true" />
 
     <ListPreference
         android:defaultValue="@string/progressive_load_interval_default_value"
@@ -107,10 +107,10 @@
             android:entries="@array/seekbar_preview_thumbnail_type_description"
             android:entryValues="@array/seekbar_preview_thumbnail_type_key"
             android:key="@string/seekbar_preview_thumbnail_key"
-            android:summary="%s"
             android:title="@string/seekbar_preview_thumbnail_title"
             app:singleLineTitle="false"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
 
     </PreferenceCategory>
 
@@ -211,10 +211,10 @@
             android:entries="@array/seek_duration_description"
             android:entryValues="@array/seek_duration_value"
             android:key="@string/seek_duration_key"
-            android:summary="%s"
             android:title="@string/seek_duration_title"
             app:singleLineTitle="false"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"