diff --git a/app/build.gradle b/app/build.gradle
index deedca2..0b425b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.0'
 
     defaultConfig {
         applicationId "org.y20k.trackbook"
         minSdkVersion 22
-        targetSdkVersion 25
-        versionCode 10
-        versionName "1.0.3 (Astronomy Domine)"
+        targetSdkVersion 26
+        versionCode 11
+        versionName "1.0.4 (Astronomy Domine)"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -22,9 +22,9 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.0.0-beta2'
+    compile 'com.android.support:design:26.0.0-beta2'
+    compile 'com.android.support:cardview-v7:26.0.0-beta2'
     compile 'org.osmdroid:osmdroid-android:5.6.4'
     compile 'com.google.code.gson:gson:2.8.1'
 }
diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.java b/app/src/main/java/org/y20k/trackbook/TrackerService.java
index a074a90..842e869 100644
--- a/app/src/main/java/org/y20k/trackbook/TrackerService.java
+++ b/app/src/main/java/org/y20k/trackbook/TrackerService.java
@@ -129,7 +129,7 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven
 
         // ACTION STOP
         else if (intent.getAction().equals(ACTION_STOP) || !mLocationSystemSetting) {
-            if (mTrack != null) {
+            if (mTrack != null && mTimer != null) {
                 stopTracking();
             }
 
diff --git a/app/src/main/res/drawable/ic_file_download_white_24dp.xml b/app/src/main/res/drawable/ic_file_download_white_24dp.xml
new file mode 100644
index 0000000..3e6cb05
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_download_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"
+        android:fillColor="@color/trackbook_white" />
+</vector>
diff --git a/build.gradle b/build.gradle
index d0aa704..428e343 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +15,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }