diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 683cc7bc..b55186ef 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -157,7 +157,7 @@
     <string name="pref_title_maximum_bitrate">Maximale Bitrate</string>
     <string name="pref_title_remember_queue">Warteschlange merken</string>
     <string name="pref_title_page_size">Maximale Listengröße</string>
-    <string name="pref_title_images_cache_size">Cache-Größe</string>
+    <string name="pref_title_image_cache_size">Cache-Größe</string>
     <string name="pref_summary_remember_queue">Warteschlange beim Schließen der Anwendung speichen, damit sie über Sitzungen hinweg bestehen bleibt.</string>
     <string name="source">Quellcode</string>
     <string name="report_bugs">Melde Fehler</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3067231d..89254988 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -163,7 +163,7 @@
     <string name="pref_header_images">Images</string>
     <string name="pref_summary_remember_queue">Enregistrer la liste de lecture à la fermeture de l\'application pour la conserver entre différentes utilisations.</string>
     <string name="pref_summary_remember_shuffle">Le mode aléatoire sera conservé au choix d\'une nouvelle liste de titres pour la liste de lecture.</string>
-    <string name="pref_title_images_cache_size">Taille du cache</string>
+    <string name="pref_title_image_cache_size">Taille du cache</string>
     <string name="pref_title_maximum_bitrate">Débit maximum</string>
     <string name="pref_title_page_size">Taile de liste maximum</string>
     <string name="pref_title_remember_queue">Se souvenir de la dernière liste de lecture</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 85fef521..83bebc1e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,12 +1,12 @@
 <resources>
 
-    <string-array name="pref_general_theme_list_titles">
+    <string-array name="pref_theme_titles">
         <item>@string/light_theme_name</item>
         <item>@string/dark_theme_name</item>
         <item>@string/black_theme_name</item>
     </string-array>
 
-    <string-array name="pref_general_theme_list_values">
+    <string-array name="pref_theme_values">
         <item>light</item>
         <item>dark</item>
         <item>black</item>
@@ -52,7 +52,7 @@
         <item>40</item>
     </string-array>
 
-    <string-array name="pref_images_cache_size_titles">
+    <string-array name="pref_cache_size_titles">
         <item>@string/unlimited</item>
         <item>2GB</item>
         <item>1GB</item>
@@ -60,7 +60,7 @@
         <item>200MB</item>
     </string-array>
 
-    <string-array name="pref_images_cache_size_values">
+    <string-array name="pref_cache_size_values">
         <item>2147483647</item>
         <item>2000000000</item>
         <item>1000000000</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e220d290..77347daa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -123,7 +123,7 @@
     <string name="pref_title_remember_shuffle">Remember Shuffle</string>
     <string name="pref_title_remember_queue">Remember Queue</string>
     <string name="pref_title_page_size">Page Size</string>
-    <string name="pref_title_images_cache_size">Cache Size</string>
+    <string name="pref_title_image_cache_size">Cache Size</string>
 
     <string name="primary_color_desc">The primary theme color for control elements.</string>
     <string name="accent_color_desc">An alternate color used to accent elements.</string>
diff --git a/app/src/main/res/xml/pref_cache.xml b/app/src/main/res/xml/pref_cache.xml
index 72b24cf4..3dc37a8f 100644
--- a/app/src/main/res/xml/pref_cache.xml
+++ b/app/src/main/res/xml/pref_cache.xml
@@ -7,12 +7,12 @@
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
             app:iconSpaceReserved="false"
             android:defaultValue="400000000"
-            android:entries="@array/pref_images_cache_size_titles"
-            android:entryValues="@array/pref_images_cache_size_values"
+            android:entries="@array/pref_cache_size_titles"
+            android:entryValues="@array/pref_cache_size_values"
             android:key="image_cache_size"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
-            android:title="@string/pref_title_images_cache_size" />
+            android:title="@string/pref_title_image_cache_size" />
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml
index 2b342a06..c588cbb1 100644
--- a/app/src/main/res/xml/pref_interface.xml
+++ b/app/src/main/res/xml/pref_interface.xml
@@ -6,8 +6,8 @@
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
             app:iconSpaceReserved="false"
             android:defaultValue="dark"
-            android:entries="@array/pref_general_theme_list_titles"
-            android:entryValues="@array/pref_general_theme_list_values"
+            android:entries="@array/pref_theme_titles"
+            android:entryValues="@array/pref_theme_values"
             android:key="general_theme"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"