2 files changed, 6 insertions, 5 deletions

diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index 514d38b4e6..efbbca4d1b 100644
--- a/apps/keymaps/keymap-mr100.c
+++ b/apps/keymaps/keymap-mr100.c
@@ -275,12 +275,12 @@ static const struct button_mapping button_context_keyboard[]  = {
 static const struct button_mapping remote_button_context_standard[]  = {
     { ACTION_STD_PREV,          BUTTON_RC_PLAY,                 BUTTON_NONE },
     { ACTION_STD_PREVREPEAT,    BUTTON_RC_PLAY|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_RC_DISPLAY,              BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_RC_DISPLAY|BUTTON_REPEAT,BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_RC_DOWN,              BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_RC_DOWN|BUTTON_REPEAT,BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_RC_REW,                  BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_RC_FF|BUTTON_REL,        BUTTON_RC_FF },
     { ACTION_STD_CONTEXT,       BUTTON_RC_FF|BUTTON_REPEAT,     BUTTON_RC_FF },
-    { ACTION_STD_MENU,          BUTTON_RC_FAV,                  BUTTON_NONE },
+    { ACTION_STD_MENU,          BUTTON_RC_HEART,                  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
@@ -297,7 +297,7 @@ static const struct button_mapping remote_button_context_wps[]  = {
     { ACTION_WPS_STOPSEEK,      BUTTON_RC_FF|BUTTON_REL,        BUTTON_RC_FF|BUTTON_REPEAT },
 
     { ACTION_WPS_STOP,          BUTTON_RC_PLAY|BUTTON_REPEAT,   BUTTON_RC_PLAY },
-    { ACTION_WPS_MENU,          BUTTON_RC_FAV,                  BUTTON_NONE },
+    { ACTION_WPS_MENU,          BUTTON_RC_HEART,                  BUTTON_NONE },
 
     { ACTION_WPS_VOLDOWN,       BUTTON_RC_VOL_DOWN,             BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
@@ -340,7 +340,7 @@ static const struct button_mapping remote_button_context_usb_hid[] = {
     { ACTION_USB_HID_VOLUP,    BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_USB_HID_VOLDOWN,  BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
     { ACTION_USB_HID_VOLDOWN,  BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_MENU,     BUTTON_RC_FAV,                    BUTTON_NONE },
+    { ACTION_USB_HID_MENU,     BUTTON_RC_HEART,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* remote_button_context_usb_hid */
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 976fd262f8..accb286369 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -75,6 +75,7 @@ static bool abort;
 
 #elif CONFIG_KEYPAD == MROBE100_PAD
 #define STATS_STOP BUTTON_POWER
+#define STATS_STOP_REMOTE BUTTON_RC_DOWN
 
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
 #define STATS_STOP BUTTON_REC