diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index 5e53f425..d2b5732e 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -1133,6 +1133,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                     } else {
                         currentDuckVolume = 1f;
                     }
+
                     service.playback.setVolume(currentDuckVolume);
                     break;
 
@@ -1147,6 +1148,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                     } else {
                         currentDuckVolume = 1f;
                     }
+
                     service.playback.setVolume(currentDuckVolume);
                     break;
 
@@ -1163,8 +1165,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
                 case TRACK_ENDED:
                     // if there is a timer finished, don't continue
-                    if (service.pendingQuit ||
-                            service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
+                    if (service.pendingQuit || service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
                         service.notifyChange(PLAY_STATE_CHANGED);
                         service.seek(0);
                         if (service.pendingQuit) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ec138f37..a2435100 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -164,7 +164,7 @@
     <string name="pref_header_images">Bilder</string>
     <string name="pref_title_maximum_bitrate">Maximale Bitrate</string>
     <string name="pref_title_remember_queue">Warteschlange merken</string>
-    <string name="pref_title_maximum_list_size">Maximale Listengröße</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_images_external_directory">Externes Verzeichnis</string>
     <string name="pref_summary_images_external_directory">"Bildcache in externem Verzeichnis speichern, um die Dateien zwischen Installationen aufzubewahren. "</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d2dc778b..142482d0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -175,7 +175,7 @@
     <string name="pref_title_images_cache_size">Taille du cache</string>
     <string name="pref_title_images_external_directory">Dossier externe</string>
     <string name="pref_title_maximum_bitrate">Débit maximum</string>
-    <string name="pref_title_maximum_list_size">Taile de liste 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>
     <string name="pref_title_remember_shuffle">Se souvenir du mode aléatoire</string>
     <string name="pref_title_transcode_codec">Codec de transcodage</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 8c9a1955..85fef521 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -36,20 +36,20 @@
         <item>128000</item>
     </string-array>
 
-    <string-array name="pref_maximum_list_size_titles">
+    <string-array name="pref_page_size_titles">
         <item>@string/unlimited</item>
-        <item>1000</item>
         <item>400</item>
-        <item>200</item>
         <item>100</item>
+        <item>60</item>
+        <item>40</item>
     </string-array>
 
-    <string-array name="pref_maximum_list_size_values">
-        <item>10000000</item>
-        <item>1000</item>
+    <string-array name="pref_page_size_values">
+        <item>100000</item>
         <item>400</item>
-        <item>200</item>
         <item>100</item>
+        <item>60</item>
+        <item>40</item>
     </string-array>
 
     <string-array name="pref_images_cache_size_titles">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da1f000e..b571e234 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,7 +124,7 @@
     <string name="pref_title_remember_last_tab">Remember Tab</string>
     <string name="pref_title_remember_shuffle">Remember Shuffle</string>
     <string name="pref_title_remember_queue">Remember Queue</string>
-    <string name="pref_title_maximum_list_size">Maximum List Size</string>
+    <string name="pref_title_page_size">Page Size</string>
     <string name="pref_title_images_cache_size">Cache Size</string>
     <string name="pref_title_images_external_directory">External Directory</string>
     <string name="pref_summary_images_external_directory">Store the image cache in an external directory to keep the files between installs.</string>
diff --git a/app/src/main/res/xml/pref_library.xml b/app/src/main/res/xml/pref_library.xml
index f8a75612..c240836b 100644
--- a/app/src/main/res/xml/pref_library.xml
+++ b/app/src/main/res/xml/pref_library.xml
@@ -12,12 +12,12 @@
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
             app:iconSpaceReserved="false"
             android:defaultValue="100"
-            android:entries="@array/pref_maximum_list_size_titles"
-            android:entryValues="@array/pref_maximum_list_size_values"
+            android:entries="@array/pref_page_size_titles"
+            android:entryValues="@array/pref_page_size_values"
             android:key="maximum_list_size"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
-            android:title="@string/pref_title_maximum_list_size" />
+            android:title="@string/pref_title_page_size" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             app:iconSpaceReserved="false"