diff --git a/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java b/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java
index 5649b5f..787c501 100755
--- a/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java
+++ b/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java
@@ -406,7 +406,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
         GeoPoint position;
 
         // get current position
-        if (mTrackerServiceRunning && mTrack != null) {
+        if (mTrackerServiceRunning && mTrack != null && mTrack.getSize() > 0) {
             // get current Location from tracker service
             mCurrentBestLocation = mTrack.getWayPointLocation(mTrack.getSize() - 1);
         } else if (mCurrentBestLocation == null) {
diff --git a/app/src/main/res/drawable/ic_my_location_dot_blue_grey_24dp.xml b/app/src/main/res/drawable/ic_my_location_dot_blue_grey_24dp.xml
new file mode 100644
index 0000000..95a2828
--- /dev/null
+++ b/app/src/main/res/drawable/ic_my_location_dot_blue_grey_24dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:viewportHeight="96.0"
+        android:viewportWidth="96.0"
+        android:width="24dp">
+    <path
+        android:fillAlpha="0.33"
+        android:fillColor="@color/trackbook_blue"
+        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
+    <path
+        android:fillColor="@color/trackbook_grey_light"
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_my_location_dot_red_grey_24dp.xml b/app/src/main/res/drawable/ic_my_location_dot_red_grey_24dp.xml
new file mode 100644
index 0000000..b470e56
--- /dev/null
+++ b/app/src/main/res/drawable/ic_my_location_dot_red_grey_24dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:viewportHeight="96.0"
+        android:viewportWidth="96.0"
+        android:width="24dp">
+    <path
+        android:fillAlpha="0.33"
+        android:fillColor="@color/trackbook_red"
+        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
+    <path
+        android:fillColor="@color/trackbook_grey_light"
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+</vector>
diff --git a/build.gradle b/build.gradle
index 8daa0e5..3c3ace6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ allprojects {
 
         constraintlayoutVersion = '1.1.3'
         materialVersion = "1.0.0"
-        appcompatVersion = '1.0.0'
+        appcompatVersion = '1.0.2'
         cardviewVersion = '1.0.0'
 
         osmdroidVersion = '6.0.2'