diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index b528d90cab..6fd6fe4c2a 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -4,21 +4,24 @@
     android:versionName="1.2" android:installLocation="preferExternal">
     <uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:hasCode="true">
+        android:hasCode="true"
+        android:banner="@drawable/banner">
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
         <activity android:name="com.retroarch.browser.DisplayRefreshRateTest"/>
         <activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
diff --git a/android/phoenix/res/drawable-xhdpi/banner.png b/android/phoenix/res/drawable-xhdpi/banner.png
new file mode 100644
index 0000000000..c9ce27e493
Binary files /dev/null and b/android/phoenix/res/drawable-xhdpi/banner.png differ
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 9f94adfb16..7a9d9e1456 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -970,6 +970,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
    unsigned ret                            = 0;
    static bool initial_held                = true;
    static bool first_held                  = false;
+   static int cooldown                     = 0;
    static const retro_input_t input_repeat =
         (1UL << RETRO_DEVICE_ID_JOYPAD_UP)
       | (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN)
@@ -1041,10 +1042,16 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
       ret = MENU_ACTION_SCROLL_UP;
    else if (trigger_input & (1ULL << settings->menu_scroll_down_btn))
       ret = MENU_ACTION_SCROLL_DOWN;
-   else if (trigger_input & (1ULL << settings->menu_cancel_btn))
+   else if (trigger_input & (1ULL << settings->menu_cancel_btn) && !cooldown)
+   {
       ret = MENU_ACTION_CANCEL;
-   else if (trigger_input & (1ULL << settings->menu_ok_btn))
+      cooldown = 20;
+   }
+   else if (trigger_input & (1ULL << settings->menu_ok_btn) && !cooldown)
+   {
       ret = MENU_ACTION_OK;
+      cooldown = 20;
+   }
    else if (trigger_input & (1ULL << settings->menu_search_btn))
       ret = MENU_ACTION_SEARCH;
    else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y))
@@ -1064,6 +1071,9 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
    if (settings->menu.pointer.enable)
       menu_input_pointer(&ret);
 
+   if (cooldown > 0)
+      cooldown--;
+
    if (trigger_input &&
          menu_ctx_driver_get_ptr()->perform_action &&
          menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret))