diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/location/LocationLayerModesActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/location/LocationLayerModesActivity.java
index 1dec7753e..361253a8d 100644
--- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/location/LocationLayerModesActivity.java
+++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/location/LocationLayerModesActivity.java
@@ -20,6 +20,7 @@
 import com.mapbox.android.core.location.LocationEnginePriority;
 import com.mapbox.android.core.location.LocationEngineProvider;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
+import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -141,13 +142,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
       return super.onOptionsItemSelected(item);
     }
 
-    if (item.getItemId() == R.id.action_style_change) {
+    int id = item.getItemId();
+    if (id == R.id.action_style_change) {
       toggleStyle();
       return true;
-    } else if (item.getItemId() == R.id.action_plugin_disable) {
+    } else if (id == R.id.action_map_style_change) {
+      toggleMapStyle();
+      return true;
+    } else if (id == R.id.action_plugin_disable) {
       locationLayerPlugin.setLocationLayerEnabled(false);
       return true;
-    } else if (item.getItemId() == R.id.action_plugin_enabled) {
+    } else if (id == R.id.action_plugin_enabled) {
       locationLayerPlugin.setLocationLayerEnabled(true);
       return true;
     }
@@ -162,6 +167,12 @@ public void toggleStyle() {
       : R.style.mapbox_LocationLayer);
   }
 
+  @VisibleForTesting
+  public void toggleMapStyle() {
+    String styleUrl = mapboxMap.getStyleUrl().contentEquals(Style.DARK) ? Style.LIGHT : Style.DARK;
+    mapboxMap.setStyle(styleUrl);
+  }
+
   @VisibleForTesting
   public LocationLayerPlugin getLocationLayerPlugin() {
     return locationLayerPlugin;
diff --git a/app/src/main/res/menu/menu_location.xml b/app/src/main/res/menu/menu_location.xml
index eb8148819..c9c932583 100644
--- a/app/src/main/res/menu/menu_location.xml
+++ b/app/src/main/res/menu/menu_location.xml
@@ -2,7 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/action_style_change"
-          android:title="Toggle custom style"
+          android:title="Toggle custom LocationLayer style"
+          app:showAsAction="never"/>
+
+    <item android:id="@+id/action_map_style_change"
+          android:title="Toggle custom Map style"
           app:showAsAction="never"/>
 
     <item android:id="@+id/action_plugin_disable"
diff --git a/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java b/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
index aac2e8a9d..8359791b5 100644
--- a/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
+++ b/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
@@ -99,6 +99,7 @@ final class LocationLayer implements LocationLayerAnimator.OnLayerAnimationsValu
 
   void initializeComponents(LocationLayerOptions options) {
     prepareLocationSource();
+    addLocationSource();
     addLayers();
     applyStyle(options);
   }
diff --git a/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerPlugin.java b/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerPlugin.java
index b9baf7884..55146ddce 100644
--- a/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerPlugin.java
+++ b/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerPlugin.java
@@ -471,6 +471,8 @@ private void initialize() {
     updateMapWithOptions(options);
 
     enableLocationLayerPlugin();
+    setRenderMode(RenderMode.NORMAL);
+    setCameraMode(CameraMode.NONE);
   }
 
   @SuppressLint("MissingPermission")
@@ -604,6 +606,7 @@ public void onMapChanged(int change) {
         locationLayer.initializeComponents(options);
         locationLayerCamera.initializeOptions(options);
         setRenderMode(locationLayer.getRenderMode());
+        setCameraMode(locationLayerCamera.getCameraMode());
         onStart();
       }
     }