Index: apps/menus/settings_menu.c
===================================================================
--- apps/menus/settings_menu.c	(revision 18763)
+++ apps/menus/settings_menu.c	(working copy)
@@ -499,7 +499,7 @@
 
 MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
           Icon_General_settings_menu,
-          &playback_settings, &playlist_settings, &file_menu,
+          &playlist_settings, &file_menu,
 #ifdef HAVE_TAGCACHE
           &tagcache_menu,
 #endif
Index: apps/menus/main_menu.c
===================================================================
--- apps/menus/main_menu.c	(revision 18763)
+++ apps/menus/main_menu.c	(working copy)
@@ -548,11 +548,13 @@
 #endif
 MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
         Icon_Submenu_Entered,
+        &settings_menu_item,
         &sound_settings,
-        &settings_menu_item, &theme_menu,
+        &playback_settings,
 #ifdef HAVE_RECORDING
         &recording_settings,
 #endif
+        &theme_menu,
         &manage_settings,
         );
 /*    MAIN MENU                    */