diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c
index 1ccf7e956f..355a87e78f 100644
--- a/apps/keymaps/keymap-fiiom3k.c
+++ b/apps/keymaps/keymap-fiiom3k.c
@@ -185,20 +185,23 @@ static const struct button_mapping button_context_quickscreen[] = {
 
 static const struct button_mapping button_context_pitchscreen[] = {
     {ACTION_PS_INC_SMALL,           BUTTON_UP,                          BUTTON_NONE},
-    {ACTION_PS_INC_SMALL,           BUTTON_SCROLL_BACK,                 BUTTON_NONE},
-    {ACTION_PS_INC_BIG,             BUTTON_VOL_UP,                      BUTTON_NONE},
+    {ACTION_PS_INC_BIG,             BUTTON_UP|BUTTON_REPEAT,            BUTTON_NONE},
+    {ACTION_PS_INC_BIG,             BUTTON_SCROLL_BACK,                 BUTTON_NONE},
+    {ACTION_PS_INC_BIG,             BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_NONE},
     {ACTION_PS_DEC_SMALL,           BUTTON_DOWN,                        BUTTON_NONE},
-    {ACTION_PS_DEC_SMALL,           BUTTON_SCROLL_FWD,                  BUTTON_NONE},
-    {ACTION_PS_DEC_BIG,             BUTTON_VOL_DOWN,                    BUTTON_NONE},
+    {ACTION_PS_DEC_BIG,             BUTTON_DOWN|BUTTON_REPEAT,          BUTTON_NONE},
+    {ACTION_PS_DEC_BIG,             BUTTON_SCROLL_FWD,                  BUTTON_NONE},
+    {ACTION_PS_DEC_BIG,             BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_NONE},
     {ACTION_PS_NUDGE_LEFT,          BUTTON_LEFT,                        BUTTON_NONE},
     {ACTION_PS_NUDGE_RIGHT,         BUTTON_RIGHT,                       BUTTON_NONE},
     {ACTION_PS_NUDGE_LEFTOFF,       BUTTON_LEFT|BUTTON_REL,             BUTTON_NONE},
     {ACTION_PS_NUDGE_RIGHTOFF,      BUTTON_RIGHT|BUTTON_REL,            BUTTON_NONE},
-    {ACTION_PS_TOGGLE_MODE,         BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
+    {ACTION_PS_TOGGLE_MODE,         BUTTON_MENU,                        BUTTON_NONE},
+    {ACTION_PS_EXIT,                BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
     {ACTION_PS_RESET,               BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_SELECT},
-    {ACTION_PS_EXIT,                BUTTON_POWER,                       BUTTON_NONE},
-    {ACTION_PS_FASTER,              BUTTON_BACK,                        BUTTON_NONE},
-    {ACTION_PS_SLOWER,              BUTTON_MENU,                        BUTTON_NONE},
+    {ACTION_PS_EXIT,                BUTTON_BACK,                        BUTTON_NONE},
+    {ACTION_PS_FASTER,              BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_NONE},
+    {ACTION_PS_SLOWER,              BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_NONE},
     LAST_ITEM_IN_LIST
 }; /* button_context_pitchscreen */
 
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index aea0c444a2..f074026e60 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -151,8 +151,9 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
     { ACTION_PS_TOGGLE_MODE,    BUTTON_PLAY,                BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_SELECT,              BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_MENU,                BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT},
+    { ACTION_PS_RESET,          BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT},
     { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
 
diff --git a/manual/platform/keymap-fiiom3k.tex b/manual/platform/keymap-fiiom3k.tex
index 2112673f03..812ef21b9f 100644
--- a/manual/platform/keymap-fiiom3k.tex
+++ b/manual/platform/keymap-fiiom3k.tex
@@ -78,17 +78,17 @@
 \newcommand{\ActionKbdAbort}{\ButtonPower}
 
 %Button actions, Pitch Screen context
-\newcommand{\ActionPsToggleMode}{\ButtonSelect}
-\newcommand{\ActionPsIncSmall}{\ButtonUp{} or \ButtonScrollBack}
-\newcommand{\ActionPsDecSmall}{\ButtonDown{} or \ButtonScrollFwd}
-\newcommand{\ActionPsIncBig}{\ButtonVolUp}
-\newcommand{\ActionPsDecBig}{\ButtonVolDown}
+\newcommand{\ActionPsToggleMode}{\ButtonMenu}
+\newcommand{\ActionPsIncSmall}{\ButtonUp}
+\newcommand{\ActionPsDecSmall}{\ButtonDown}
+\newcommand{\ActionPsIncBig}{Long \ButtonUp{} or \ButtonScrollBack}
+\newcommand{\ActionPsDecBig}{Long \ButtonDown {} or \ButtonScrollFwd}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{Long \ButtonSelect}
-\newcommand{\ActionPsExit}{\ButtonPower}
-\newcommand{\ActionPsFaster}{\ButtonBack}
-\newcommand{\ActionPsSlower}{\ButtonMenu}
+\newcommand{\ActionPsExit}{\ButtonBack{} or \ButtonSelect}
+\newcommand{\ActionPsFaster}{Long \ButtonRight}
+\newcommand{\ActionPsSlower}{Long \ButtonLeft}
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\ButtonPlay}
diff --git a/manual/platform/keymap-ipod1g2g.tex b/manual/platform/keymap-ipod1g2g.tex
index 2db45b0803..9399b101af 100644
--- a/manual/platform/keymap-ipod1g2g.tex
+++ b/manual/platform/keymap-ipod1g2g.tex
@@ -77,8 +77,8 @@
 \newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
-\newcommand{\ActionPsReset}{\ButtonMenu}
-\newcommand{\ActionPsExit}{\ButtonSelect}
+\newcommand{\ActionPsReset}{Long \ButtonSelect}
+\newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonMenu}
diff --git a/manual/platform/keymap-ipod3g.tex b/manual/platform/keymap-ipod3g.tex
index cb855a4a47..1370a700e1 100644
--- a/manual/platform/keymap-ipod3g.tex
+++ b/manual/platform/keymap-ipod3g.tex
@@ -77,8 +77,8 @@
 \newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
-\newcommand{\ActionPsReset}{\ButtonMenu}
-\newcommand{\ActionPsExit}{\ButtonSelect}
+\newcommand{\ActionPsReset}{Long \ButtonSelect}
+\newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonMenu}
diff --git a/manual/platform/keymap-ipod4g.tex b/manual/platform/keymap-ipod4g.tex
index e4c49a81a3..8210884409 100644
--- a/manual/platform/keymap-ipod4g.tex
+++ b/manual/platform/keymap-ipod4g.tex
@@ -78,8 +78,8 @@
 \newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
-\newcommand{\ActionPsReset}{\ButtonMenu}
-\newcommand{\ActionPsExit}{\ButtonSelect}
+\newcommand{\ActionPsReset}{Long \ButtonSelect}
+\newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonPlay}