diff --git a/apk/GPSLogger-2.1.2.apk b/apk/GPSLogger-2.1.2.apk
new file mode 100644
index 00000000..6c0fce40
Binary files /dev/null and b/apk/GPSLogger-2.1.2.apk differ
diff --git a/apk/GPSLogger-latest.apk b/apk/GPSLogger-latest.apk
deleted file mode 100644
index c340673a..00000000
Binary files a/apk/GPSLogger-latest.apk and /dev/null differ
diff --git a/apk/GPSLogger-latest.apk b/apk/GPSLogger-latest.apk
new file mode 120000
index 00000000..0c6b7c64
--- /dev/null
+++ b/apk/GPSLogger-latest.apk
@@ -0,0 +1 @@
+/home/Graziano/GrazianoCapelli/GPSLogger/apk/GPSLogger-2.1.2.apk
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index e42a9f26..fb37f4b1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
diff --git a/app/build.gradle b/app/build.gradle
index 2d272077..c9930560 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "eu.basicairdata.graziano.gpslogger"
         minSdkVersion 8
         targetSdkVersion 23
-        versionCode 12
-        versionName '2.1.1'
+        versionCode 13
+        versionName '2.1.2'
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1afe0476..357f710d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,19 +36,22 @@
         android:icon="@mipmap/gps_logger"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:alwaysRetainTaskState="true"
-        android:launchMode="singleInstance"
         android:theme="@style/MyMaterialTheme">
-        <activity android:name=".GPSActivity">
+        <activity android:name=".GPSActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"
-                    android:launchMode="singleInstance"/>
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".SettingsActivity"
-            android:launchMode="singleInstance"
+            android:label="@string/menu_settings"
+            android:launchMode="singleTask"
             android:configChanges="orientation|screenSize">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".GPSActivity" />
         </activity>
         <service
             android:name=".GPSService"
diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/FragmentSettings.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/FragmentSettings.java
index cfa921f0..b2becc52 100644
--- a/app/src/main/java/eu/basicairdata/graziano/gpslogger/FragmentSettings.java
+++ b/app/src/main/java/eu/basicairdata/graziano/gpslogger/FragmentSettings.java
@@ -27,11 +27,13 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.SwitchPreferenceCompat;
+import android.support.v7.view.ContextThemeWrapper;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -62,7 +64,7 @@ public class FragmentSettings extends PreferenceFragmentCompat {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //setRetainInstance(true);
+
         addPreferencesFromResource(R.xml.app_preferences);
 
         File tsd = new File(Environment.getExternalStorageDirectory() + "/GPSLogger");
@@ -354,6 +356,33 @@ protected void onPostExecute(String result) {
                     Downloaded = true;
                     Toast.makeText(context, getString(R.string.toast_download_completed), Toast.LENGTH_SHORT).show();
                     PrefEGM96SetToTrue();
+
+                    // Ask to switch to Absolute Altitude Mode if not already active.
+                    ListPreference pKMLAltitudeMode = (ListPreference) findPreference("prefKMLAltitudeMode");
+                    if (!(pKMLAltitudeMode.getValue().equals("0"))) {
+                        AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(getContext(), R.style.StyledDialog));
+                        builder.setMessage(getResources().getString(R.string.pref_message_switch_to_absolute_altitude_mode));
+                        builder.setIcon(android.R.drawable.ic_menu_info_details);
+                        builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getContext());
+                                SharedPreferences.Editor editor1 = settings.edit();
+                                editor1.putString("prefKMLAltitudeMode", "0");
+                                editor1.commit();
+                                ListPreference pKMLAltitudeMode = (ListPreference) findPreference("prefKMLAltitudeMode");
+                                pKMLAltitudeMode.setValue("0");
+                                pKMLAltitudeMode.setSummary(R.string.pref_KML_altitude_mode_absolute);
+                            }
+                        });
+                        builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.dismiss();
+                            }
+                        });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+                    }
+
                 } else {
                     Toast.makeText(context, getString(R.string.toast_download_failed), Toast.LENGTH_SHORT).show();
                 }
diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSActivity.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSActivity.java
index b4acccf1..f1349a93 100644
--- a/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSActivity.java
+++ b/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSActivity.java
@@ -145,34 +145,7 @@ public void onPause() {
     @Override
     public void onBackPressed() {
         //moveTaskToBack(true);
-        if ((GPSApplication.getInstance().getCurrentTrack().getNumberOfLocations() > 0)
-                || (GPSApplication.getInstance().getCurrentTrack().getNumberOfPlacemarks() > 0)) {
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.StyledDialog));
-            builder.setMessage(getResources().getString(R.string.message_exit_confirmation));
-            builder.setIcon(android.R.drawable.ic_menu_info_details);
-            builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    GPSApplication.getInstance().setRecording(false);
-                    EventBus.getDefault().post("NEW_TRACK");
-                    GPSApplication.getInstance().StopAndUnbindGPSService();
-                    //super.onBackPressed();
-                    dialog.dismiss();
-                    finish();
-                }
-            });
-            builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    dialog.dismiss();
-                }
-            });
-            AlertDialog dialog = builder.create();
-            dialog.show();
-        } else {
-            GPSApplication.getInstance().StopAndUnbindGPSService();
-            //super.onBackPressed();
-            finish();
-        }
+        ShutdownApp();
     }
 
     @Override
@@ -226,6 +199,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
             aboutDialog.show(fm, "");
             return true;
         }
+        if (id == R.id.action_shutdown) {
+            ShutdownApp();
+            return true;
+        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -309,6 +286,43 @@ private void LoadPreferences() {
         else getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
+    private void ShutdownApp()
+    {
+        if ((GPSApplication.getInstance().getCurrentTrack().getNumberOfLocations() > 0)
+                || (GPSApplication.getInstance().getCurrentTrack().getNumberOfPlacemarks() > 0)
+                || (GPSApplication.getInstance().getRecording())
+                || (GPSApplication.getInstance().getPlacemarkRequest())) {
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.StyledDialog));
+            builder.setMessage(getResources().getString(R.string.message_exit_confirmation));
+            builder.setIcon(android.R.drawable.ic_menu_info_details);
+            builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    GPSApplication.getInstance().setRecording(false);
+                    GPSApplication.getInstance().setPlacemarkRequest(false);
+                    EventBus.getDefault().post("NEW_TRACK");
+                    GPSApplication.getInstance().StopAndUnbindGPSService();
+
+                    dialog.dismiss();
+                    finish();
+                }
+            });
+            builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    dialog.dismiss();
+                }
+            });
+            AlertDialog dialog = builder.create();
+            dialog.show();
+        } else {
+            GPSApplication.getInstance().setRecording(false);
+            GPSApplication.getInstance().setPlacemarkRequest(false);
+            GPSApplication.getInstance().StopAndUnbindGPSService();
+
+            finish();
+        }
+    }
+
 
     public void CheckPermissions () {
         List<String> listPermissionsNeeded = new ArrayList<>();
diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSApplication.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSApplication.java
index 8104a98c..22abf0d2 100644
--- a/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSApplication.java
+++ b/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSApplication.java
@@ -701,7 +701,7 @@ private void LoadPreferences() {
             Log.w("myApp", "[#] GPSApplication.java - Manual Correction set to " + prefAltitudeCorrection + " m");
         prefExportKML = preferences.getBoolean("prefExportKML", true);
         prefExportGPX = preferences.getBoolean("prefExportGPX", true);
-        prefKMLAltitudeMode = Integer.valueOf(preferences.getString("prefKMLAltitudeMode", "0"));
+        prefKMLAltitudeMode = Integer.valueOf(preferences.getString("prefKMLAltitudeMode", "1"));
         prefShowTrackStatsType = Integer.valueOf(preferences.getString("prefShowTrackStatsType", "0"));
         prefShowDirections = Integer.valueOf(preferences.getString("prefShowDirections", "0"));
 
diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSService.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSService.java
index fe4de9c0..5cbf5a4f 100644
--- a/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSService.java
+++ b/app/src/main/java/eu/basicairdata/graziano/gpslogger/GPSService.java
@@ -53,8 +53,9 @@ private Notification getNotification() {
         final Intent startIntent = new Intent(getApplicationContext(), GPSActivity.class);
         startIntent.setAction(Intent.ACTION_MAIN);
         startIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-        startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent contentIntent = PendingIntent.getActivity(this, 1, startIntent, 0);
+        //startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        PendingIntent contentIntent = PendingIntent.getActivity(getApplicationContext(), 1, startIntent, 0);
         builder.setContentIntent(contentIntent);
         Notification notification = builder.build();
         return notification;
@@ -79,6 +80,7 @@ public void run() {
     public void onCreate() {
         super.onCreate();
         singleton = this;
+        // THREAD FOR DEBUG PURPOSE
         //if (!t.isAlive()) {
         //    t.start();
         //}
@@ -102,6 +104,7 @@ public IBinder onBind(Intent intent) {
     @Override
     public void onDestroy() {
         Log.w("myApp", "[#] GPSService.java - DESTROY = onDestroy");
+        // THREAD FOR DEBUG PURPOSE
         //if (t.isAlive()) t.interrupt();
         super.onDestroy();
     }
diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/Track.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/Track.java
index f0362b39..72b73e9a 100644
--- a/app/src/main/java/eu/basicairdata/graziano/gpslogger/Track.java
+++ b/app/src/main/java/eu/basicairdata/graziano/gpslogger/Track.java
@@ -950,7 +950,7 @@ public int getTrackType() {
                 if ((Altitude_Up != NOT_AVAILABLE) && (Altitude_Down != NOT_AVAILABLE))
                     if ((Altitude_Down + Altitude_Up > (0.1f * Distance)) && (Distance > 500.0f))
                         return TRACK_TYPE_MOUNTAIN;
-                else return TRACK_TYPE_RUN;
+                else return TRACK_TYPE_WALK;
             }
         }
         if ((Altitude_Up != NOT_AVAILABLE) && (Altitude_Down != NOT_AVAILABLE))
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 75aa993a..4964f869 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -33,6 +33,11 @@
         android:orderInCategory="101"
         android:title="@string/menu_about"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_shutdown"
+        android:orderInCategory="102"
+        android:title="@string/menu_shutdown"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_track_finished"
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track2_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track2_white_24dp.png
new file mode 100644
index 00000000..368ea977
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track2_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track3_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track3_white_24dp.png
new file mode 100644
index 00000000..41259c74
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track3_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track4_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track4_white_24dp.png
new file mode 100644
index 00000000..7ff8fd84
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track4_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track5_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track5_white_24dp.png
new file mode 100644
index 00000000..245f9857
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track5_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track6_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track6_white_24dp.png
new file mode 100644
index 00000000..50894a5a
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track6_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track7_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track7_white_24dp.png
new file mode 100644
index 00000000..5436baf1
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track7_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_track_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_track_white_24dp.png
new file mode 100644
index 00000000..422583c2
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_track_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_save_white_24dp.png b/app/src/main/res/mipmap-hdpi/ic_save_white_24dp.png
new file mode 100644
index 00000000..dd3f1066
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track2_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track2_white_24dp.png
new file mode 100644
index 00000000..a609c883
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track2_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track3_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track3_white_24dp.png
new file mode 100644
index 00000000..2a23db2b
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track3_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track4_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track4_white_24dp.png
new file mode 100644
index 00000000..6d194513
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track4_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track5_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track5_white_24dp.png
new file mode 100644
index 00000000..5b2e310e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track5_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track6_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track6_white_24dp.png
new file mode 100644
index 00000000..5146a022
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track6_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track7_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track7_white_24dp.png
new file mode 100644
index 00000000..37302be9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track7_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_track_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_track_white_24dp.png
new file mode 100644
index 00000000..85f3fe01
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_track_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_save_white_24dp.png b/app/src/main/res/mipmap-mdpi/ic_save_white_24dp.png
new file mode 100644
index 00000000..015062ed
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track2_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track2_white_24dp.png
new file mode 100644
index 00000000..4997d768
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track2_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track3_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track3_white_24dp.png
new file mode 100644
index 00000000..c2401538
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track3_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track4_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track4_white_24dp.png
new file mode 100644
index 00000000..19ec2491
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track4_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track5_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track5_white_24dp.png
new file mode 100644
index 00000000..917ec120
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track5_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track6_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track6_white_24dp.png
new file mode 100644
index 00000000..a6918966
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track6_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track7_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track7_white_24dp.png
new file mode 100644
index 00000000..f1c810a5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track7_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_track_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_track_white_24dp.png
new file mode 100644
index 00000000..e2f38b7f
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_track_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_save_white_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_save_white_24dp.png
new file mode 100644
index 00000000..adda0957
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track2_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track2_white_24dp.png
new file mode 100644
index 00000000..e0b67bf8
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track2_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track3_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track3_white_24dp.png
new file mode 100644
index 00000000..8c787948
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track3_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track4_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track4_white_24dp.png
new file mode 100644
index 00000000..0b2da4af
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track4_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track5_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track5_white_24dp.png
new file mode 100644
index 00000000..93bd6533
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track5_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track6_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track6_white_24dp.png
new file mode 100644
index 00000000..a9f6b6d8
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track6_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track7_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track7_white_24dp.png
new file mode 100644
index 00000000..cd36cb79
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track7_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_track_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_track_white_24dp.png
new file mode 100644
index 00000000..60062f86
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_track_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_save_white_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_save_white_24dp.png
new file mode 100644
index 00000000..3e0ce1a5
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track2_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track2_white_24dp.png
new file mode 100644
index 00000000..2163923a
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track2_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track3_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track3_white_24dp.png
new file mode 100644
index 00000000..981be3dc
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track3_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track4_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track4_white_24dp.png
new file mode 100644
index 00000000..d8202def
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track4_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track5_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track5_white_24dp.png
new file mode 100644
index 00000000..e0d5790a
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track5_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track6_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track6_white_24dp.png
new file mode 100644
index 00000000..b71368b9
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track6_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track7_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track7_white_24dp.png
new file mode 100644
index 00000000..0437c614
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track7_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_track_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_track_white_24dp.png
new file mode 100644
index 00000000..f511bec3
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_track_white_24dp.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_save_white_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_save_white_24dp.png
new file mode 100644
index 00000000..bd80bf1f
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34d10d14..952f428a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,6 +69,7 @@
     <string name="toast_track_finished_click_again">Double click to finish this track</string>
     <string name="toast_track_saved_into_tracklist">Track saved into the Tracklist</string>
     <string name="menu_about">About</string>
+    <string name="menu_shutdown">Shutdown</string>
 
     <!-- Placemark Creation dialog -->
     <string name="dlg_add_placemark">Add Placemark</string>
@@ -141,7 +142,6 @@
     <string name="pref_AltitudeCorrection_summary_offset">Offset</string>
     <string name="pref_AltitudeCorrection_summary_not_defined">No offset defined</string>
 
-
     <string name="pref_category_exporting">EXPORTING</string>
     <string name="pref_export_KML">Export Tracks in KML</string>
     <string name="pref_export_KML_summary">Google Keyhole Markup Language (v.2.2)</string>
@@ -154,6 +154,8 @@
     <string name="pref_track_stats_totaltime">Total time</string>
     <string name="pref_track_stats_movingtime">Moving time</string>
 
+    <!-- Preferences messages -->
+    <string name="pref_message_switch_to_absolute_altitude_mode">We suggest to switch to Absolute Altitude Mode, to view your tracks in 3D in Google Earth. \n\nYou can switch anytime between Absolute and Projected to ground in the Exporting section of Settings.</string>
 
     <!-- Preferences toasts -->
     <string name="toast_download_error">Download error</string>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index 88623e8f..18edcd4b 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -130,7 +130,7 @@
         android:summary=" "
         android:entries="@array/KMLAltitudeMode"
         android:entryValues="@array/KMLAltitudeModeValues"
-        android:defaultValue="0" />
+        android:defaultValue="1" />
 
     </android.support.v7.preference.PreferenceCategory>
 
diff --git a/sourcecode/GPSLogger-2.1.2 - Source.zip b/sourcecode/GPSLogger-2.1.2 - Source.zip
new file mode 100644
index 00000000..a0c5b701
Binary files /dev/null and b/sourcecode/GPSLogger-2.1.2 - Source.zip differ