diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang
index 5eccf03629..9bf95fbc74 100644
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@@ -417,7 +417,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index adb44b59f8..0a220e141f 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -416,7 +416,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 3d79fd62a4..1c6a659767 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -419,7 +419,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 92264f42eb..6164acd8d2 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -8621,7 +8621,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 49f4fd824b..190a547c14 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -8802,7 +8802,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index e71e4dd179..33a5c9a4dd 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -423,7 +423,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index c2c6b4f09d..015d8100a5 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -9702,7 +9702,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 86f4a81c63..72ce8a178c 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -432,7 +432,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 81a68d5315..3bdd673c4a 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -410,7 +410,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index ef1690f6ef..1a5413175d 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -488,7 +488,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
@@ -5937,16 +5937,16 @@
 </phrase>
 <phrase>
   id: LANG_CATALOG
-  desc: in main menu and onplay menu
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist Catalogue"
+    *: ""
   </source>
   <dest>
-    *: "Playlist Catalogue"
+    *: ""
   </dest>
   <voice>
-    *: "Playlist Catalogue"
+    *: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 5698ce0df7..706c6517c1 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -9020,7 +9020,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 094d122da0..b328b93dec 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -9620,7 +9620,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 345a9ac5ca..b4bfa9190f 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -443,7 +443,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index 197f69aa56..a97dcf2ddf 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -11429,7 +11429,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 8ceb26d5c3..854193a92e 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -423,7 +423,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index 19c7049858..95c6774296 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -417,7 +417,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index cf19f958ee..c0368a2e54 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -414,7 +414,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index afbb1bb681..031e4defa6 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -419,7 +419,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 00683302e2..21c36d457f 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -427,7 +427,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index 7216993ff9..dabaad7c0d 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -417,7 +417,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index cdad5f3924..a88488a3f0 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -411,7 +411,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 7b30907261..87f5551f41 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -8910,7 +8910,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index d74a485f0e..2a65128bb7 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -9931,7 +9931,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index b5756bfa1f..da734b6709 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -420,7 +420,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 0fca053f95..3c9a90102b 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -418,7 +418,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index a5e79b6275..92f2f345b2 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -11517,7 +11517,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 82b9be2433..e9f74191b1 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -9402,7 +9402,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index cf53553002..a8b5a4403b 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -8938,7 +8938,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 7f68a0c5f0..ae89522933 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -412,7 +412,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 4bab9937c1..62113361df 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -10793,7 +10793,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 623cc370aa..e5433fa048 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -412,7 +412,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 8b28a79815..4a85960d42 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -425,7 +425,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 2e0423bc3b..675ae1c117 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -388,7 +388,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 595224ac8e..b2791b0ea6 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -417,7 +417,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index 6b93febd88..90d72fbff7 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -9596,7 +9596,7 @@
 </phrase>
 <phrase>
   id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
   user: core
   <source>
     *: "Playlists"
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index cff8dd3f2a..44ab6b8bd9 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -160,8 +160,8 @@ static int display_playlists(char* playlist, enum catbrowse_status_flags status)
     struct browse_context browse = {
         .dirfilter = SHOW_M3U,
         .flags = BROWSE_SELECTONLY | (view ? 0 : BROWSE_NO_CONTEXT_MENU),
-        .title = str(LANG_CATALOG),
-        .icon = Icon_NOICON,
+        .title = str(LANG_PLAYLISTS),
+        .icon = Icon_Playlist,
         .root = selected_playlist,
         .selected = &most_recent_playlist[playlist_dir_length + 1],
         .buf = selected_playlist,
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 61a3fd8c6a..f5cd276484 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -503,9 +503,6 @@ MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER,
 MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS,
                         NULL, Icon_Plugin);
 
-MENUITEM_RETURNVALUE(playlist_browser, ID2P(LANG_CATALOG), GO_TO_PLAYLIST_VIEWER,
-                        NULL, Icon_Playlist);
-
 static char *get_wps_item_name(int selected_item, void * data,
                                char *buffer, size_t buffer_len)
 {
@@ -529,7 +526,7 @@ MENUITEM_RETURNVALUE(menu_, ID2P(LANG_SETTINGS), GO_TO_MAINMENU,
 MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
                         GO_TO_RECENTBMARKS,  item_callback,
                         Icon_Bookmark);
-MENUITEM_RETURNVALUE(playlists, ID2P(LANG_CATALOG), GO_TO_PLAYLISTS_SCREEN,
+MENUITEM_RETURNVALUE(playlists, ID2P(LANG_PLAYLISTS), GO_TO_PLAYLISTS_SCREEN,
                      NULL, Icon_Playlist);
 MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
                      NULL, Icon_System_menu);
diff --git a/apps/settings_list.c b/apps/settings_list.c
index c3b9c83175..c946da57a3 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1893,7 +1893,7 @@ const struct settings_list settings[] = {
 #ifdef HAVE_TAGCACHE
                       ID2P(LANG_TAGCACHE),
 #endif
-                      ID2P(LANG_CATALOG)),
+                      ID2P(LANG_PLAYLISTS)),
 
 #ifdef HAVE_BACKLIGHT
     CHOICE_SETTING(0, backlight_on_button_hold,
diff --git a/apps/tree.c b/apps/tree.c
index ceeba827df..97eb0b1e6d 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -745,7 +745,8 @@ static int dirbrowse(void)
 
     if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0)
     {
-        splash(HZ*2, ID2P(LANG_NO_FILES));
+        splash(HZ*2, *tc.dirfilter == SHOW_M3U ?
+                     ID2P(LANG_CATALOG_NO_PLAYLISTS) : ID2P(LANG_NO_FILES));
         return exit_to_new_screen(GO_TO_PREVIOUS);  /* No files found for rockbox_browse() */
     }