diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index caadfcc79..5ee8f0bf7 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -1669,6 +1669,12 @@ const char * CRCInput::getSpecialKeyName(const unsigned int key)
 				return "pos";
 			case RC_sleep:
 				return "sleep";
+			case RC_nextsong:
+				return "next song";
+			case RC_previoussong:
+				return "previous song";
+			case RC_bookmarks:
+				return "bookmarks";
 			default:
 				printf("unknown key: %d (0x%x) \n", key, key);
 				return "unknown";
@@ -1712,10 +1718,14 @@ int CRCInput::translate(int code)
 			return RC_play;
 		case KEY_PROGRAM:
 			return RC_timer;
-		case KEY_NEXTSONG:
-			return RC_next;
-		case KEY_PREVIOUSSONG:
-			return RC_prev;
+		case KEY_CHANNELUP:
+			return RC_page_up;
+		case KEY_CHANNELDOWN:
+			return RC_page_down;
+#ifdef HAVE_ARM_HARDWARE
+		case KEY_VIDEO:
+			return RC_favorites;
+#endif
 #ifdef HAVE_AZBOX_HARDWARE
 		case KEY_HOME:
 			return RC_favorites;
@@ -1725,10 +1735,6 @@ int CRCInput::translate(int code)
 			return RC_record;
 		case KEY_PLAY:
 			return RC_pause;
-		case KEY_CHANNELUP:
-			return RC_page_up;
-		case KEY_CHANNELDOWN:
-			return RC_page_down;
 #endif
 		default:
 			break;
diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
index d2c29e50f..44692a4b2 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -249,6 +249,9 @@ class CRCInput
 			RC_sub		= KEY_SUBTITLE,
 			RC_pos		= KEY_MOVE,
 			RC_sleep	= KEY_SLEEP,
+			RC_nextsong	= KEY_NEXTSONG,
+			RC_previoussong	= KEY_PREVIOUSSONG,
+			RC_bookmarks	= KEY_BOOKMARKS,
 
 			RC_power_on	= KEY_POWERON,
 			RC_power_off	= KEY_POWEROFF,