2 files changed, 9 insertions, 8 deletions

diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c
index bdd8b2dae4..191b36a1ca 100644
--- a/apps/keymaps/keymap-zenxfi3.c
+++ b/apps/keymaps/keymap-zenxfi3.c
@@ -138,10 +138,11 @@ static const struct button_mapping button_context_radio[]  = {
 #ifdef HAVE_RECORDING
 static const struct button_mapping button_context_recscreen[]  = {
     { ACTION_REC_PAUSE,                BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY },
-    { ACTION_SETTINGS_INC,             BUTTON_UP,                          BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,       BUTTON_UP|BUTTON_REPEAT,            BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,             BUTTON_DOWN,                        BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,       BUTTON_DOWN|BUTTON_REPEAT,          BUTTON_NONE },
+    /* we need up/down to switch between settings, so use volume up/down to adjust */
+    { ACTION_SETTINGS_INC,             BUTTON_VOL_UP,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,       BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,             BUTTON_VOL_DOWN,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,       BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_recscreen */
diff --git a/uisimulator/buttonmap/creative-zenxfi3.c b/uisimulator/buttonmap/creative-zenxfi3.c
index fcf78a3e90..fd17d18dd3 100644
--- a/uisimulator/buttonmap/creative-zenxfi3.c
+++ b/uisimulator/buttonmap/creative-zenxfi3.c
@@ -34,8 +34,8 @@ int key_to_button(int keyboard_button)
             new_btn = BUTTON_LEFT;
             break;
         case SDLK_KP6:
-        case SDLK_RIGHT:
-            new_btn = BUTTON_RIGHT;
+        case SDLK_RETURN:
+            new_btn = BUTTON_PLAY;
             break;
         case SDLK_KP8:
         case SDLK_UP:
@@ -45,8 +45,8 @@ int key_to_button(int keyboard_button)
         case SDLK_DOWN:
             new_btn = BUTTON_DOWN;
             break;
-        case SDLK_PAGEDOWN:
         case SDLK_KP3:
+        case SDLK_RIGHT:
             new_btn = BUTTON_MENU;
             break;
         case SDLK_KP_PLUS:
@@ -64,7 +64,7 @@ int key_to_button(int keyboard_button)
 
 struct button_map bm[] = {
     { SDLK_LEFT,         69, 303, 10, "Left" },
-    { SDLK_RIGHT,       241, 172, 10, "Right" },
+    { SDLK_RETURN,      241, 172, 10, "Play/Pause" },
     { SDLK_UP,          240,  87, 10, "Up" },
     { SDLK_DOWN,        239, 264, 10, "Down" },
     { SDLK_PAGEDOWN,    191, 303, 10, "Menu" },