3 files changed, 11 insertions, 11 deletions

diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index aa04461b64..b1a3e4aae1 100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
@@ -138,7 +138,8 @@ static const struct button_mapping button_context_settings_right_is_inc[]  = {
 }; /* button_context_settingsgraphical */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY,      BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT, BUTTON_POWER,        BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
 
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 2543060486..2e4cb2d96f 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -341,6 +341,7 @@
     *: "PLAY = Yes"
     h100,h120,h300: "NAVI = Yes"
     yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    mrobe500: "PLAY or POWER = Yes"
     player: "(PLAY/STOP)"
   </dest>
   <voice>
@@ -4217,6 +4218,7 @@
   <source>
     *: none
     rtc: "ON = Set"
+    mrobe500: "HEART = Set"
     h100,h120,h300: "NAVI = Set"
     ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
     sa9200: "PLAY = Set"
@@ -4224,6 +4226,7 @@
   <dest>
     *: none
     rtc: "ON = Set"
+    mrobe500: "HEART = Set"
     h100,h120,h300: "NAVI = Set"
     ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
     sa9200: "PLAY = Set"
@@ -4240,6 +4243,7 @@
   <source>
     *: none
     rtc: "OFF = Revert"
+    mrobe500: "POWER = Revert"
     h100,h120,h300: "STOP = Revert"
     ipod*,c200*: "MENU = Revert"
     x5,m5: "RECORD = Revert"
@@ -4252,6 +4256,7 @@
   <dest>
     *: none
     rtc: "OFF = Revert"
+    mrobe500: "POWER = Revert"
     h100,h120,h300: "STOP = Revert"
     ipod*,c200*: "MENU = Revert"
     x5,m5: "RECORD = Revert"
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 85040b2cd6..ed75fb7d17 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -196,15 +196,6 @@ static void setoptions (void)
         options.MENU=BUTTON_POWER;
         
 #elif CONFIG_KEYPAD == MROBE500_PAD
-        options.UP=BUTTON_RC_PLAY;
-        options.DOWN=BUTTON_RC_DOWN;
-        options.LEFT=BUTTON_RC_REW;
-        options.RIGHT=BUTTON_RC_FF;
-
-        options.A=BUTTON_RC_VOL_DOWN;
-        options.B=BUTTON_RC_VOL_UP;
-        options.START=BUTTON_RC_HEART;
-        options.SELECT=BUTTON_RC_MODE;
         options.MENU=BUTTON_POWER;
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
@@ -275,7 +266,10 @@ static void setoptions (void)
         options.DOWN=BUTTON_BOTTOMMIDDLE;
         options.START=BUTTON_TOPRIGHT;
         options.SELECT=BUTTON_CENTER;
-#if CONFIG_KEYPAD != COWOND2_PAD
+#if CONFIG_KEYPAD == MROBE500_PAD
+        options.A=BUTTON_BOTTOMLEFT;
+        options.B=BUTTON_BOTTOMRIGHT;
+#elif CONFIG_KEYPAD != COWOND2_PAD
         options.A=BUTTON_BOTTOMLEFT;
         options.B=BUTTON_BOTTOMRIGHT;
         options.MENU=BUTTON_TOPLEFT;