diff --git a/ios/RetroArch/input/ios_input.c b/ios/RetroArch/input/ios_input.c
index 8ed6111b96..3364884a0a 100644
--- a/ios/RetroArch/input/ios_input.c
+++ b/ios/RetroArch/input/ios_input.c
@@ -156,44 +156,27 @@ const input_driver_t input_ios = {
 // Key table
 #include "keycode.h"
 static const struct rarch_key_map rarch_key_map_hidusage[] = {
-   { KEY_Left, RETROK_LEFT },
-   { KEY_Right, RETROK_RIGHT },
-   { KEY_Up, RETROK_UP },
-   { KEY_Down, RETROK_DOWN },
-   { KEY_Enter, RETROK_RETURN },
-   { KEY_Tab, RETROK_TAB },
-   { KEY_Insert, RETROK_INSERT },
-   { KEY_Delete, RETROK_DELETE },
-   { KEY_RightShift, RETROK_RSHIFT },
-   { KEY_LeftShift, RETROK_LSHIFT },
-   { KEY_RightControl, RETROK_RCTRL },
-   { KEY_LeftControl, RETROK_LCTRL },
-   { KEY_End, RETROK_END },
-   { KEY_Home, RETROK_HOME },
-   { KEY_PageDown, RETROK_PAGEDOWN },
-   { KEY_PageUp, RETROK_PAGEUP },
-   { KEY_RightAlt, RETROK_RALT },
-   { KEY_LeftAlt, RETROK_LALT },
-   { KEY_Space, RETROK_SPACE },
-   { KEY_Escape, RETROK_ESCAPE },
    { KEY_Delete, RETROK_BACKSPACE },
-   { KP_Enter, RETROK_KP_ENTER },
-   { KP_Add, RETROK_KP_PLUS },
-   { KP_Subtract, RETROK_KP_MINUS },
-   { KP_Multiply, RETROK_KP_MULTIPLY },
-   { KP_Divide, RETROK_KP_DIVIDE },
-   { KEY_Grave, RETROK_BACKQUOTE },
+   { KEY_Tab, RETROK_TAB },
+//   RETROK_CLEAR },
+   { KEY_Enter, RETROK_RETURN },
    { KEY_Pause, RETROK_PAUSE },
-   { KP_0, RETROK_KP0 },
-   { KP_1, RETROK_KP1 },
-   { KP_2, RETROK_KP2 },
-   { KP_3, RETROK_KP3 },
-   { KP_4, RETROK_KP4 },
-   { KP_5, RETROK_KP5 },
-   { KP_6, RETROK_KP6 },
-   { KP_7, RETROK_KP7 },
-   { KP_8, RETROK_KP8 },
-   { KP_9, RETROK_KP9 },
+   { KEY_Escape, RETROK_ESCAPE },
+   { KEY_Space, RETROK_SPACE },
+//   RETROK_EXCLAIM },
+//   RETROK_QUOTEDBL },
+//   RETROK_HASH },
+//   RETROK_DOLLAR },
+//   RETROK_AMPERSAND },
+   { KEY_Quote, RETROK_QUOTE },
+//   RETROK_LEFTPAREN },
+//   RETROK_RIGHTPAREN },
+//   RETROK_ASTERISK },
+//   RETROK_PLUS },
+   { KEY_Comma, RETROK_COMMA },
+   { KEY_Minus, RETROK_MINUS },
+   { KEY_Period, RETROK_PERIOD },
+   { KEY_Slash, RETROK_SLASH },
    { KEY_0, RETROK_0 },
    { KEY_1, RETROK_1 },
    { KEY_2, RETROK_2 },
@@ -204,18 +187,19 @@ static const struct rarch_key_map rarch_key_map_hidusage[] = {
    { KEY_7, RETROK_7 },
    { KEY_8, RETROK_8 },
    { KEY_9, RETROK_9 },
-   { KEY_F1, RETROK_F1 },
-   { KEY_F2, RETROK_F2 },
-   { KEY_F3, RETROK_F3 },
-   { KEY_F4, RETROK_F4 },
-   { KEY_F5, RETROK_F5 },
-   { KEY_F6, RETROK_F6 },
-   { KEY_F7, RETROK_F7 },
-   { KEY_F8, RETROK_F8 },
-   { KEY_F9, RETROK_F9 },
-   { KEY_F10, RETROK_F10 },
-   { KEY_F11, RETROK_F11 },
-   { KEY_F12, RETROK_F12 },
+//   RETROK_COLON },
+   { KEY_Semicolon, RETROK_SEMICOLON },
+//   RETROK_LESS },
+   { KEY_Equals, RETROK_EQUALS },
+//   RETROK_GREATER },
+//   RETROK_QUESTION },
+//   RETROK_AT },
+   { KEY_LeftBracket, RETROK_LEFTBRACKET },
+   { KEY_Backslash, RETROK_BACKSLASH },
+   { KEY_RightBracket, RETROK_RIGHTBRACKET },
+//   RETROK_CARET },
+//   RETROK_UNDERSCORE },
+   { KEY_Grave, RETROK_BACKQUOTE },
    { KEY_A, RETROK_a },
    { KEY_B, RETROK_b },
    { KEY_C, RETROK_c },
@@ -242,5 +226,75 @@ static const struct rarch_key_map rarch_key_map_hidusage[] = {
    { KEY_X, RETROK_x },
    { KEY_Y, RETROK_y },
    { KEY_Z, RETROK_z },
+   { KEY_DeleteForward, RETROK_DELETE },
+
+   { KP_0, RETROK_KP0 },
+   { KP_1, RETROK_KP1 },
+   { KP_2, RETROK_KP2 },
+   { KP_3, RETROK_KP3 },
+   { KP_4, RETROK_KP4 },
+   { KP_5, RETROK_KP5 },
+   { KP_6, RETROK_KP6 },
+   { KP_7, RETROK_KP7 },
+   { KP_8, RETROK_KP8 },
+   { KP_9, RETROK_KP9 },
+   { KP_Point, RETROK_KP_PERIOD },
+   { KP_Divide, RETROK_KP_DIVIDE },
+   { KP_Multiply, RETROK_KP_MULTIPLY },
+   { KP_Subtract, RETROK_KP_MINUS },
+   { KP_Add, RETROK_KP_PLUS },
+   { KP_Enter, RETROK_KP_ENTER },
+   { KP_Equals, RETROK_KP_EQUALS },
+
+   { KEY_Up, RETROK_UP },
+   { KEY_Down, RETROK_DOWN },
+   { KEY_Right, RETROK_RIGHT },
+   { KEY_Left, RETROK_LEFT },
+   { KEY_Insert, RETROK_INSERT },
+   { KEY_Home, RETROK_HOME },
+   { KEY_End, RETROK_END },
+   { KEY_PageUp, RETROK_PAGEUP },
+   { KEY_PageDown, RETROK_PAGEDOWN },
+
+   { KEY_F1, RETROK_F1 },
+   { KEY_F2, RETROK_F2 },
+   { KEY_F3, RETROK_F3 },
+   { KEY_F4, RETROK_F4 },
+   { KEY_F5, RETROK_F5 },
+   { KEY_F6, RETROK_F6 },
+   { KEY_F7, RETROK_F7 },
+   { KEY_F8, RETROK_F8 },
+   { KEY_F9, RETROK_F9 },
+   { KEY_F10, RETROK_F10 },
+   { KEY_F11, RETROK_F11 },
+   { KEY_F12, RETROK_F12 },
+   { KEY_F13, RETROK_F13 },
+   { KEY_F14, RETROK_F14 },
+   { KEY_F15, RETROK_F15 },
+
+//   RETROK_NUMLOCK },
+//   RETROK_CAPSLOCK },
+//   RETROK_SCROLLOCK },
+//   RETROK_RSHIFT },
+//   RETROK_LSHIFT },
+//   RETROK_RCTRL },
+//   RETROK_LCTRL },
+//   RETROK_RALT },
+//   RETROK_LALT },
+//   RETROK_RMETA },
+//   RETROK_LMETA },
+//   RETROK_LSUPER },
+//   RETROK_RSUPER },
+//   RETROK_MODE },
+//   RETROK_COMPOSE },
+
+//   RETROK_HELP },
+   { KEY_PrintScreen, RETROK_PRINT },
+//   RETROK_SYSREQ },
+//   RETROK_BREAK },
+   { KEY_Menu, RETROK_MENU },
+//   RETROK_POWER },
+//   RETROK_EURO },
+//   RETROK_UNDO },
    { 0, RETROK_UNKNOWN }
 };
diff --git a/ios/RetroArch/settings/RAButtonGetter.m b/ios/RetroArch/settings/RAButtonGetter.m
index cf891a5be4..c31ef0667c 100644
--- a/ios/RetroArch/settings/RAButtonGetter.m
+++ b/ios/RetroArch/settings/RAButtonGetter.m
@@ -58,7 +58,7 @@ static const struct
    { "keypad8", KP_8 },                { "keypad9", KP_9 },
    
    { "period", KEY_Period },           { "capslock", KEY_CapsLock },
-   { "numlock", KP_NumLock },          { "print", KEY_PrintScreen },
+   { "numlock", KP_NumLock },          { "print_screen", KEY_PrintScreen },
    { "scroll_lock", KEY_ScrollLock },
    
    { "a", KEY_A }, { "b", KEY_B }, { "c", KEY_C }, { "d", KEY_D },