diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
index 7d25c438f..1baa96db6 100644
--- a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
+++ b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
@@ -86,6 +86,11 @@ public class MainActivity extends ActionBarActivity {
                 locationManager.requestSingleUpdate(provider, new MyLocationListener(), null);
                 return true;
 
+            case R.id.action_debug:
+                // Toggle debug mode
+                mMapFragment.getMap().toggleDebug();
+                return true;
+
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_about.png b/android/java/app/src/main/res/drawable-hdpi/ic_action_about.png
new file mode 100644
index 000000000..077dcec80
Binary files /dev/null and b/android/java/app/src/main/res/drawable-hdpi/ic_action_about.png differ
diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_about.png b/android/java/app/src/main/res/drawable-mdpi/ic_action_about.png
new file mode 100644
index 000000000..624e745b6
Binary files /dev/null and b/android/java/app/src/main/res/drawable-mdpi/ic_action_about.png differ
diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png b/android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png
new file mode 100644
index 000000000..3be315270
Binary files /dev/null and b/android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png differ
diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png b/android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png
new file mode 100644
index 000000000..0fe809b90
Binary files /dev/null and b/android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png differ
diff --git a/android/java/app/src/main/res/menu/menu_main.xml b/android/java/app/src/main/res/menu/menu_main.xml
index d952c13e1..0b9c10aff 100644
--- a/android/java/app/src/main/res/menu/menu_main.xml
+++ b/android/java/app/src/main/res/menu/menu_main.xml
@@ -4,4 +4,8 @@
         android:icon="@drawable/ic_action_location_found"
         android:title="@string/action_gps"
         app:showAsAction="ifRoom" />
+    <item android:id="@+id/action_debug"
+        android:icon="@drawable/ic_action_about"
+        android:title="@string/action_debug"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/android/java/app/src/main/res/values/strings.xml b/android/java/app/src/main/res/values/strings.xml
index 2661ce8a5..fe5385adf 100644
--- a/android/java/app/src/main/res/values/strings.xml
+++ b/android/java/app/src/main/res/values/strings.xml
@@ -5,12 +5,14 @@
 
     <string name="action_gps">Go to GPS location</string>
 
+    <string name="action_debug">Toggle debug mode</string>
+
     <string-array name="style_list">
         <item>Bright</item>
         <item>Basic</item>
         <item>Outdoors</item>
-        <!--<item>Pencil</item>-->
         <item>Satellite</item>
+        <!--<item>Pencil</item>-->
         <!--<item>Empty</item>-->
     </string-array>