diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
index 6b407acbd..df524f990 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -247,6 +247,12 @@ public class MainActivity extends ActionBarActivity {
             case R.id.action_markers:
                 // Toggle markers
                 toggleMarkers(!mIsMarkersOn);
+                return true;
+
+            case R.id.action_compass:
+                // Toggle compass
+                mapView.setCompassEnabled(!mapView.isCompassEnabled());
+                return true;
 
             default:
                 return super.onOptionsItemSelected(item);
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_explore_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_explore_white_24dp.png
new file mode 100644
index 000000000..69ac91f7b
Binary files /dev/null and b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_explore_white_24dp.png differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png
deleted file mode 100644
index f3a57845b..000000000
Binary files a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png and /dev/null differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png
deleted file mode 100644
index 94a783781..000000000
Binary files a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png and /dev/null differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_explore_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_explore_white_24dp.png
new file mode 100644
index 000000000..17f1883a0
Binary files /dev/null and b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_explore_white_24dp.png differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png
deleted file mode 100644
index d8c156388..000000000
Binary files a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png and /dev/null differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_explore_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_explore_white_24dp.png
new file mode 100644
index 000000000..cfe12105f
Binary files /dev/null and b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_explore_white_24dp.png differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png
deleted file mode 100644
index 157c48ade..000000000
Binary files a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png and /dev/null differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_explore_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_explore_white_24dp.png
new file mode 100644
index 000000000..599711f99
Binary files /dev/null and b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_explore_white_24dp.png differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png
deleted file mode 100644
index ccc56f660..000000000
Binary files a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png and /dev/null differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_explore_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_explore_white_24dp.png
new file mode 100644
index 000000000..33031d077
Binary files /dev/null and b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_explore_white_24dp.png differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png
deleted file mode 100644
index 2318f1b7c..000000000
Binary files a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png and /dev/null differ
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
index f16522d99..b682fe0cb 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
@@ -12,4 +12,8 @@
           android:icon="@drawable/ic_action_location_searching"
           android:title="@string/action_gps"
           app:showAsAction="ifRoom" />
+    <item android:id="@+id/action_compass"
+          android:icon="@drawable/ic_explore_white_24dp"
+          android:title="@string/action_compass"
+          app:showAsAction="ifRoom"/>
 </menu>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 95419a5a6..0022fe045 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name">Mapbox GL</string>
 
     <string name="action_gps">Toggle GPS location</string>
+    <string name="action_compass">Toggle Compass</string>
 
     <string name="action_debug">Toggle debug mode</string>