diff --git a/core/src/main/java/com/mapzen/android/graphics/OverlayManager.java b/core/src/main/java/com/mapzen/android/graphics/OverlayManager.java
index 2dec79b1..cb309dbb 100644
--- a/core/src/main/java/com/mapzen/android/graphics/OverlayManager.java
+++ b/core/src/main/java/com/mapzen/android/graphics/OverlayManager.java
@@ -1,6 +1,5 @@
 package com.mapzen.android.graphics;
 
-import com.mapzen.R;
 import com.mapzen.android.graphics.model.Marker;
 import com.mapzen.android.graphics.model.Polygon;
 import com.mapzen.android.graphics.model.Polyline;
@@ -936,13 +935,13 @@ private MapData addPointToMarkerMapData(Marker marker) {
   }
 
   @Override public boolean onPan(float startX, float startY, float endX, float endY) {
-    final View findMe = mapView.findViewById(R.id.mz_find_me);
+    final View findMe = mapView.getFindMe();
     findMe.setActivated(false);
     return false;
   }
 
   @Override public boolean onFling(float posX, float posY, float velocityX, float velocityY) {
-    final View findMe = mapView.findViewById(R.id.mz_find_me);
+    final View findMe = mapView.getFindMe();
     findMe.setActivated(false);
     return false;
   }
diff --git a/core/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java b/core/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java
index 1638b67a..378830b4 100644
--- a/core/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java
+++ b/core/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java
@@ -526,12 +526,14 @@ public void addPolyline_shouldRequireTwoPoints() {
   }
 
   @Test public void onPan_shouldDeactivateFindMe() throws Exception {
+    when(mapView.getFindMe()).thenReturn(findMeButton);
     findMeButton.setActivated(true);
     overlayManager.onPan(1f, 2f, 3f, 4f);
     assertThat(findMeButton.isActivated()).isFalse();
   }
 
   @Test public void onFling_shouldDeactivateFindMe() throws Exception {
+    when(mapView.getFindMe()).thenReturn(findMeButton);
     findMeButton.setActivated(true);
     overlayManager.onFling(1f, 2f, 3f, 4f);
     assertThat(findMeButton.isActivated()).isFalse();