diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 63e855cceb..1f11a7c5c2 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -542,8 +542,11 @@
 #elif CONFIG_KEYPAD == FIIO_M3K_PAD
 #define OSCILLOSCOPE_QUIT           BUTTON_POWER
 #define OSCILLOSCOPE_DRAWMODE       BUTTON_MENU
+#define OSCILLOSCOPE_GRAPHMODE_PRE  BUTTON_BACK
+#define OSCILLOSCOPE_GRAPHMODE      (BUTTON_BACK | BUTTON_REPEAT)
 #define OSCILLOSCOPE_ADVMODE        BUTTON_PLAY
-#define OSCILLOSCOPE_ORIENTATION    BUTTON_BACK
+#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_BACK
+#define OSCILLOSCOPE_ORIENTATION    (BUTTON_BACK | BUTTON_REL)
 #define OSCILLOSCOPE_PAUSE          BUTTON_SELECT
 #define OSCILLOSCOPE_SPEED_UP       BUTTON_SCROLL_BACK
 #define OSCILLOSCOPE_SPEED_DOWN     BUTTON_SCROLL_FWD
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 200afabf73..8cdb57bdab 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -10,6 +10,17 @@ to user input and music may start to skip.
 \subsubsection{Keys}
 
 \begin{btnmap}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonRec}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
+    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{Long \ButtonUp}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,MROBE100_PAD}{Long \ButtonPlay}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonLeft}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonLeft}
+    \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
+    \opt{RG_NANO_PAD}{\ButtonB}
+    \opt{FIIO_M3K_PAD}{Long \ButtonBack}
+    & Toggle waveform / peaks \\
     \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD%
@@ -24,6 +35,7 @@ to user input and music may start to skip.
     \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
        \opt{HAVEREMOTEKEYMAP}{& }
     \opt{RG_NANO_PAD}{\ButtonX}
+    \opt{FIIO_M3K_PAD}{\ButtonMenu}
     & Toggle filled / curve / plot \\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
@@ -41,6 +53,7 @@ to user input and music may start to skip.
     \opt{XDUOO_X3_PAD}{\ButtonHome}
        \opt{HAVEREMOTEKEYMAP}{& }
     \opt{RG_NANO_PAD}{\ButtonB}
+    \opt{FIIO_M3K_PAD}{\ButtonPlay}
     & Toggle whether to scroll or not \\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
@@ -59,6 +72,7 @@ to user input and music may start to skip.
     \opt{XDUOO_X3_PAD}{Long \ButtonPlay}
        \opt{HAVEREMOTEKEYMAP}{& }
     \opt{RG_NANO_PAD}{\ButtonR}
+    \opt{FIIO_M3K_PAD}{\ButtonBack}
     & Toggle drawing orientation \\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
@@ -73,6 +87,7 @@ to user input and music may start to skip.
     \opt{XDUOO_X3_PAD}{\ButtonHome}
        \opt{HAVEREMOTEKEYMAP}{& }
     \opt{RG_NANO_PAD}{\ButtonA}
+    \opt{FIIO_M3K_PAD}{\ButtonSelect}
     & Pause the demo \\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD%
         ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,RG_NANO_PAD}%
@@ -84,6 +99,7 @@ to user input and music may start to skip.
         {\ButtonVolUp{} / \ButtonVolDown}
     \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus}
        \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{FIIO_M3K_PAD}{\ButtonVolUp{} / \ButtonVolDown}
     & Increase / decrease volume\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD%
@@ -94,6 +110,7 @@ to user input and music may start to skip.
     \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF{} / \ButtonRew}
     \opt{XDUOO_X3_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{FIIO_M3K_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     & Increase / decrease speed\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
@@ -110,5 +127,6 @@ to user input and music may start to skip.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
     \opt{RG_NANO_PAD}{\ButtonStart}
+    \opt{FIIO_M3K_PAD}{\ButtonPower}
     & Exit demo \\
 \end{btnmap}