diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
index a7bbc8adc..6c77bf951 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
@@ -15,10 +14,6 @@ import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.views.MapView;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
 public class InfoWindowAdapterActivity extends AppCompatActivity {
 
     private static final String TAG = "InfoWindowAdapter";
@@ -28,14 +23,13 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_second);
+        setContentView(R.layout.activity_infowindow_adapter);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.secondToolBar);
         setSupportActionBar(toolbar);
 
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar!=null) {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowHomeEnabled(true);
         }
@@ -43,36 +37,37 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
         mMapView = (MapView) findViewById(R.id.secondMapView);
         mMapView.setAccessToken(Util.getAccessToken(this));
         mMapView.onCreate(savedInstanceState);
-
-        mMapView.setStyleUrl(MapView.StyleUrls.EMERALD);
-
+        mMapView.setStyleUrl(MapView.StyleUrls.MAPBOX_STREETS);
         mMapView.setInfoWindowAdapter(new MapView.InfoWindowAdapter() {
 
+            private int tenDp = (int) getResources().getDimension(R.dimen.attr_margin);
+
             @Override
             public View getInfoWindow(Marker marker) {
                 TextView textView = new TextView(InfoWindowAdapterActivity.this);
                 textView.setText(marker.getTitle());
-                textView.setBackgroundColor(Color.WHITE);
+                textView.setTextColor(Color.WHITE);
+                textView.setBackgroundColor(Color.parseColor(marker.getSnippet()));
+                textView.setPadding(tenDp, tenDp, tenDp, tenDp);
                 return textView;
             }
         });
 
-        mMapView.addMarker(generateMarker("Andorra", 42.505777, 1.525294));
-        mMapView.addMarker(generateMarker("Luxembourg", 49.815273, 6.129583));
-        mMapView.addMarker(generateMarker("Monaco", 43.738418, 7.424616));
-        mMapView.addMarker(generateMarker("Vatican City", 41.902916, 12.453389));
-        mMapView.addMarker(generateMarker("San Marino", 43.942360, 12.457777));
-        mMapView.addMarker(generateMarker("Malta", 35.892110, 14.427795));
-        mMapView.addMarker(generateMarker("Liechtenstein", 47.166000, 9.555373));
+        mMapView.addMarker(generateMarker("Andorra", 42.505777, 1.52529, "#F44336"));
+        mMapView.addMarker(generateMarker("Luxembourg", 49.815273, 6.129583, "#3F51B5"));
+        mMapView.addMarker(generateMarker("Monaco", 43.738418, 7.424616, "#673AB7"));
+        mMapView.addMarker(generateMarker("Vatican City", 41.902916, 12.453389, "#009688"));
+        mMapView.addMarker(generateMarker("San Marino", 43.942360, 12.457777, "#795548"));
+        mMapView.addMarker(generateMarker("Liechtenstein", 47.166000, 9.555373, "#FF5722"));
 
-        mMapView.setCenterCoordinate(new LatLng(47.798202, 3.573781));
-        mMapView.setZoomLevel(3);
+        mMapView.setCenterCoordinate(new LatLng(47.798202, 7.573781));
+        mMapView.setZoomLevel(4);
     }
 
-    private MarkerOptions generateMarker(String title, double lat, double lng){
+    private MarkerOptions generateMarker(String title, double lat, double lng, String color) {
         MarkerOptions marker = new MarkerOptions();
         marker.title(title);
-        marker.snippet(title);
+        marker.snippet(color);
         marker.position(new LatLng(lat, lng));
         return marker;
     }
@@ -95,7 +90,7 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
 
     // Called when our app goes into the background
     @Override
-    public void onPause()  {
+    public void onPause() {
         super.onPause();
 
         mMapView.onPause();
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
index b460378d1..acff5671d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
@@ -2,8 +2,11 @@ package com.mapbox.mapboxsdk.testapp;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Gravity;
+import android.view.MenuItem;
 import android.view.View;
 
 import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -19,6 +22,15 @@ public class MapFragmentActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_map_fragment);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
             transaction.add(R.id.fragment_container, mMapFragment = new MyMapFragment(), TAG_FRAGMENT);
@@ -45,4 +57,15 @@ public class MapFragmentActivity extends AppCompatActivity {
             mapView.setAttributionMargins(0, 0, tenDp, tenDp);
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
similarity index 92%
rename from android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
index 09dbab7b4..7dde0e61e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
@@ -15,7 +15,6 @@
     <com.mapbox.mapboxsdk.views.MapView
         android:id="@+id/secondMapView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
index c78d51248..77afd256a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.mapbox.mapboxsdk.testapp.MapFragmentActivity"/>
+    android:orientation="vertical"
+    tools:context="com.mapbox.mapboxsdk.testapp.MapFragmentActivity">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/primary"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
+
+