diff --git a/gfx/drivers/gl_shaders/pipeline_bokeh.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_bokeh.glsl.frag.h
index 4bba0f339c..9a88c64fb0 100644
--- a/gfx/drivers/gl_shaders/pipeline_bokeh.glsl.frag.h
+++ b/gfx/drivers/gl_shaders/pipeline_bokeh.glsl.frag.h
@@ -11,7 +11,7 @@ static const char* stock_fragment_xmb_bokeh = GLSL(
       uv.x *=  OutputSize.x / OutputSize.y;
       vec3 color = vec3(0.0);
 
-      for( int i=0; i < 8; i++ )
+      for( int i=0; i < 48; i++ )
       {
          float pha = sin(float(i) * 546.13 + 1.0) * 0.5 + 0.5;
          float siz = pow(sin(float(i) * 651.74 + 5.0) * 0.5 + 0.5, 4.0);
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 70f80f75b9..a0b38f66b9 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -1072,6 +1072,29 @@ static void handle_hotplug(android_input_t *android,
       }
    }
 
+   /* Amazon Fire TV & Fire stick */
+   else if(strstr(device_model, "AFTM") || strstr(device_model, "AFTS"))
+   {
+      RARCH_LOG("Special Device Detected: %s\n", device_model);
+      {
+         /* always map remote to port #0 */
+         if (strstr(device_name, "Amazon Fire TV Remote")
+         {
+            android->pads_connected = 0;
+            *port = 0;
+            strlcpy(name_buf, device_name, sizeof(name_buf));
+         }
+         /* remove the remote when a gamepad enters */
+         else if(strstr(android->pad_states[0].name,"Amazon Fire TV Remote"))
+         {
+            android->pads_connected = 0;
+            *port = 0;
+            strlcpy(name_buf, device_name, sizeof(name_buf));
+         }
+         else
+            strlcpy(name_buf, device_name, sizeof(name_buf));
+   }
+
    /* Other uncommon devices
     * These are mostly remote control type devices, bind them always to port 0
     * And overwrite the binding whenever a controller button is pressed