diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index ffb2209ce5..66dcc29c94 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -4674,7 +4674,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 9a7ec982cc..e221c35de4 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -1667,7 +1667,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index cfadfa2c85..6cd45e15e5 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -9256,7 +9256,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 14b30457fa..a43eaa2cdd 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -9235,7 +9235,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
@@ -9243,7 +9243,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index a5f7a20728..f614cde4d9 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -1673,7 +1673,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index e519d4b2a0..9d91daa2fe 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -9516,7 +9516,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 8a1c328ec4..ed2690e066 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -1690,7 +1690,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 1aee8090d9..94bc191b8e 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1762,15 +1762,15 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
@@ -13233,14 +13233,14 @@
   user: core
   <source>
     *: none
-    crossfade: "Auto Track Skip Only"
+    crossfade: "Automatic Track Change Only"
   </source>
   <dest>
     *: none
-    crossfade: "Auto Track Skip Only"
+    crossfade: "Automatic Track Change Only"
   </dest>
   <voice>
     *: none
-    crossfade: "Auto Track Skip Only"
+    crossfade: "Automatic Track Change Only"
   </voice>
 </phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 5a91b71da9..d1fec20154 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -8911,7 +8911,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index e3d34d55b4..5959080864 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -9673,7 +9673,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index d4d28f4574..2e25db7cad 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -1720,7 +1720,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index db68fa2ed5..200833f07f 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -1673,7 +1673,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 34960e0e2d..926a533194 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -1697,7 +1697,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 45b885f0b6..4cf8c44fe6 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -1691,7 +1691,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 9cc009d9a6..58103dc84e 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -1695,7 +1695,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index fab6f69f37..168789f803 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -9693,7 +9693,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 0a16bb7bd9..e2c96e65c2 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -1759,7 +1759,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index bc6a152eb2..997f8c80a1 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -1669,7 +1669,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
@@ -1677,7 +1677,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index b8665e2f78..47e75e63f7 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -9671,15 +9671,15 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 814a48efce..c9771161da 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -9355,7 +9355,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index cda23251a8..e55ab1488a 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -8905,7 +8905,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index a6939cfaf7..2a72aa36e8 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -1697,7 +1697,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index e4a5809314..1a13983770 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -1688,7 +1688,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index c2a39288e6..35a3552a2f 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -8224,7 +8224,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index d7e7d96fa0..bccb52f73f 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -4930,7 +4930,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 3dd1a617fe..d045a19621 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -8761,7 +8761,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 24f8721f32..d5ceaaad2b 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -1672,7 +1672,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index d0ff7a3e93..acc74e78c5 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -1694,7 +1694,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 622f41d126..03b5a61ba2 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -1671,7 +1671,7 @@
  user: core
  <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
  </source>
  <dest>
     *: none
@@ -1679,7 +1679,7 @@
  </dest>
  <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
  </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 266599a84c..be470d6d32 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -1670,7 +1670,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
@@ -1678,7 +1678,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 06747a5d9e..0cc3ed8e1d 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -1687,7 +1687,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index 32b4775495..a0ac409ea8 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -1694,7 +1694,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 9bf4c96233..da4b76fc20 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -493,8 +493,8 @@ void pcmbuf_start_track_change(bool auto_skip)
             case CROSSFADE_ENABLE_SHUFFLE:
                 crossfade = global_settings.playlist_shuffle;
                 break;
-            case CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP:
-                crossfade = global_settings.playlist_shuffle && !auto_skip;
+            case CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP:
+                crossfade = global_settings.playlist_shuffle || !auto_skip;
                 break;
             case CROSSFADE_ENABLE_ALWAYS:
                 crossfade = true;
diff --git a/apps/settings.h b/apps/settings.h
index ffadfa9eee..ea7138c8b0 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -115,7 +115,7 @@ enum {
     CROSSFADE_ENABLE_AUTOSKIP,
     CROSSFADE_ENABLE_MANSKIP,
     CROSSFADE_ENABLE_SHUFFLE,
-    CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP,
+    CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP,
     CROSSFADE_ENABLE_ALWAYS,
 };
 #endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 1a9f7f2d6e..9c6c85fa61 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1166,7 +1166,7 @@ const struct settings_list settings[] = {
     /* crossfade */
     CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0,
                    "crossfade",
-                   "off,auto track skip,man track skip,shuffle,shuffle and man track skip,always",
+                   "off,auto track change,man track skip,shuffle,shuffle or man track skip,always",
                    NULL, 6, ID2P(LANG_OFF), ID2P(LANG_AUTOTRACKSKIP),
                    ID2P(LANG_MANTRACKSKIP), ID2P(LANG_SHUFFLE),
                    ID2P(LANG_SHUFFLE_TRACKSKIP), ID2P(LANG_ALWAYS)),
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index d145014f86..ce95a54a0d 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -161,8 +161,8 @@
                     & -120 to 120       & 0.1dB\\
 %
       \opt{crossfade}{
-      crossfade     & off, auto track skip, man track skip, shuffle,
-                    shuffle and man track skip, always
+      crossfade     & off, auto track change, man track skip, shuffle,
+                    shuffle or man track skip, always
                                         & N/A\\
       crossfade fade in delay
                     & 0 to 7            & seconds\\
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 0cff2b3c37..8ac9548eaf 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -101,25 +101,25 @@ you to configure settings related to audio playback.
   \section{Crossfade}
     This section controls the behavior of the crossfader.  The crossfader, when
     enabled, smoothly fades one track into the next.  This can occur in two
-    situations: an automatic track skip and a manual track skip.  An automatic
-    track skip occurs at the end of the track, moving to the next track in the
-    playlist without user intervention.  A manual track skip occurs immediately
-    when the appropriate button is pressed.\\
+    situations: an automatic track change or a manual track skip.  An automatic
+    track change occurs at the end of the track, moving to the next track in the
+    playlist without user intervention.  A manual track skip goes to the next
+    track immediately when the appropriate button is pressed.\\
 
     Options for crossfade settings are:
     \begin{description}
       \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled
-        and all track skips are gapless.  If set to
-        \setting{Auto Track Skip Only}, crossfade occurs for automatic skips,
-        but not for manual skips.  The next setting,
+        and all track changes are gapless.  If set to
+        \setting{Automatic Track Change Only}, crossfade occurs for automatic
+        track changes, but not for manual track skips.  The next setting,
         \setting{Manual Track Skip Only}, is the opposite: tracks will only
         crossfade when manually skipped.  If set to \setting{Shuffle}, crossfade
-        is enabled for all track changes when the shuffle feature is set to
-        \setting{Yes}, but disabled otherwise.  If set to
-        \setting{Shuffle and Manual Track Skip} then crossfade will only be
-        active when shuffle is set to \setting{Yes} and the track is then
-        manually skipped.  If set to \setting{Always}, tracks will always
-        crossfade into one another.
+        is enabled for all track changes, automatic or manual, when the shuffle
+        feature is set to \setting{Yes}, but disabled otherwise.  If set to
+        \setting{Shuffle or Manual Track Skip} then crossfade will be active
+        either when shuffle is set to \setting{Yes} or the track is manually
+        skipped.  If set to \setting{Always}, tracks will always crossfade into
+        one another.
         %
       \item[Fade In Delay.] The ``fade in delay'' is the length of time between
         when the crossfade process begins and when the new track begins to fade
@@ -137,10 +137,10 @@ you to configure settings related to audio playback.
         %
       \item[Fade Out Mode.] If set to \setting{Crossfade}, one song will fade
         out and the next song will simultaneously fade in. If set to 
-        \setting{Mix}, the ending song will continue to play as normal until 
-        its end, while the starting song will fade in from under it. 
-        \setting{Mix} mode is not
-        used for manual track skips, even if it is selected here.
+        \setting{Mix}, the ending song will not fade out at all, and will
+        continue to play as normal until its end with the starting song fading
+        in from under it. \setting{Mix} mode is not used for manual track skips,
+        even if it is selected here.
       \end{description}
       
       \note{The rules above apply except in the instance where