Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 19302)
+++ apps/lang/english.lang	(working copy)
@@ -6904,16 +6904,13 @@
   desc: in main menu
   user:
   <source>
-    *: none
-    soft_shutdown: "Shut down"
+    *: "Shut down"
   </source>
   <dest>
-    *: none
-    soft_shutdown: "Shut down"
+    *: "Shut down"
   </dest>
   <voice>
-    *: none
-    soft_shutdown: "Shut down"
+    *: "Shut down"
   </voice>
 </phrase>
 <phrase>
Index: apps/features.txt
===================================================================
--- apps/features.txt	(revision 19302)
+++ apps/features.txt	(working copy)
@@ -145,10 +145,6 @@
 scrollwheel
 #endif
 
-#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
-soft_shutdown
-#endif
-
 #if defined(HAVE_SPDIF_POWER)
 spdif_power
 #endif
Index: apps/root_menu.c
===================================================================
--- apps/root_menu.c	(revision 19302)
+++ apps/root_menu.c	(working copy)
@@ -378,7 +378,7 @@
 MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
                         GO_TO_RECENTBMARKS,  item_callback, 
                         Icon_Bookmark);
-#ifdef HAVE_LCD_CHARCELLS
+
 static int do_shutdown(void)
 {
 #if CONFIG_CHARGING
@@ -391,7 +391,7 @@
 }
 MENUITEM_FUNCTION(do_shutdown_item, 0, ID2P(LANG_SHUTDOWN),
                   do_shutdown, NULL, NULL, Icon_NOICON);
-#endif
+
 MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
             item_callback, Icon_Rockbox,
             &bookmarks, &file_browser, 
@@ -405,11 +405,7 @@
 #if CONFIG_TUNER
             &fm,
 #endif
-            &playlist_options, &rocks_browser,  &info_menu
-
-#ifdef HAVE_LCD_CHARCELLS
-            ,&do_shutdown_item
-#endif
+            &playlist_options, &rocks_browser, &info_menu, &do_shutdown_item
         );
 
 static int item_callback(int action, const struct menu_item_ex *this_item)