2 files changed, 16 insertions, 5 deletions

diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c
index b97a5602c9..b0dac93386 100644
--- a/apps/keymaps/keymap-iaudio67.c
+++ b/apps/keymaps/keymap-iaudio67.c
@@ -40,11 +40,12 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_NEXT,          BUTTON_LEFT,                    BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
 
-    { ACTION_STD_OK,            BUTTON_PLAY|BUTTON_REL,       BUTTON_PLAY },
-    { ACTION_STD_OK,            BUTTON_PLAY,                    BUTTON_NONE   },
-    { ACTION_STD_CANCEL,        BUTTON_STOP,                    BUTTON_NONE   },
+    { ACTION_STD_OK,            BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_STD_OK,            BUTTON_PLAY,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_STOP,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_POWER,                   BUTTON_NONE },
 
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,        BUTTON_MENU  },
+    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,       BUTTON_MENU },
     { ACTION_STD_CONTEXT,       BUTTON_PLAY|BUTTON_REPEAT,    BUTTON_PLAY },
 //    { ACTION_STD_QUICKSCREEN,   BUTTON_REC|BUTTON_PLAY,       BUTTON_NONE   },
 
@@ -69,7 +70,8 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE  },
     { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
 
-    { ACTION_WPS_STOP,          BUTTON_STOP,         BUTTON_NONE },
+    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_STOP,          BUTTON_STOP,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index f0aacc47ec..15d0166733 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -268,6 +268,15 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_MENU
 #define DOOMBUTTON_WEAPON  BUTTON_DISPLAY
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define DOOMBUTTON_ESC     BUTTON_POWER
+#define DOOMBUTTON_UP      BUTTON_STOP
+#define DOOMBUTTON_DOWN    BUTTON_PLAY
+#define DOOMBUTTON_LEFT    BUTTON_LEFT
+#define DOOMBUTTON_RIGHT   BUTTON_RIGHT
+#define DOOMBUTTON_SHOOT   BUTTON_VOLUP
+#define DOOMBUTTON_OPEN    BUTTON_VOLDOWN
+#define DOOMBUTTON_ENTER   BUTTON_MENU
 #else
 #error Keymap not defined!
 #endif