Index: src/apps/onplay.c
===================================================================
--- src/apps/onplay.c	(revision 26715)
+++ src/apps/onplay.c	(working copy)
@@ -929,6 +929,8 @@
 MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING),
                   set_rating_inline, NULL,
                   ratingitem_callback, Icon_Questionmark);
+#endif                  
+#ifdef HAVE_PICTUREFLOW                  
 MENUITEM_RETURNVALUE(pictureflow_item, ID2P(LANG_ONPLAY_PICTUREFLOW), 
                   GO_TO_PICTUREFLOW, NULL, Icon_NOICON);                  
 #endif
@@ -1134,7 +1136,7 @@
            &rating_item,
 #endif
            &bookmark_menu, 
-#ifdef HAVE_TAGCACHE
+#ifdef HAVE_PICTUREFLOW
            &pictureflow_item,
 #endif           
            &browse_id3_item, &list_viewers_item,
Index: src/apps/settings_list.c
===================================================================
--- src/apps/settings_list.c	(revision 26715)
+++ src/apps/settings_list.c	(working copy)
@@ -1749,10 +1749,23 @@
 #ifdef HAVE_HOTKEY
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps,
         LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps",
-        "off,view playlist,show track info,pitchscreen,open with,delete,pictureflow",
-        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 7, HOTKEY_OFF,
+        "off,view playlist,show track info,pitchscreen,open with,delete"
+#ifdef HAVE_PICTUREFLOW        
+        ",pictureflow"
+#endif
+        ,UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 
+#ifdef HAVE_PICTUREFLOW        
+        7, 
+#else
+        6,
+#endif
+        HOTKEY_OFF,
         HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN,
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_PICTUREFLOW),
+        HOTKEY_OPEN_WITH, HOTKEY_DELETE
+#ifdef HAVE_PICTUREFLOW        
+        , HOTKEY_PICTUREFLOW
+#endif        
+        ),
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree,
         LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree",
         "off,open with,delete,insert,insert shuffled",