diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a750962..7bfef59df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
index 8ead0b644..a5f90165b 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
@@ -41,6 +41,10 @@ import androidx.core.app.TaskStackBuilder;
 import androidx.core.content.FileProvider;
 import androidx.viewpager.widget.ViewPager;
 
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
@@ -63,10 +67,6 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 /**
  * An activity to show the track detail.
  *
@@ -392,13 +392,11 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose
         String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
         File file = new File(dir, FileUtils.buildUniqueFileName(dir, fileName, JPEG_EXTENSION));
 
-        if (file != null) {
-            photoUri = FileProvider.getUriForFile(this, FileUtils.FILEPROVIDER, file);
-            Log.d(TAG, "Taking photo to URI: " + photoUri);
-            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-                    .putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
-            startActivityForResult(intent, CAMERA_REQUEST_CODE);
-        }
+        photoUri = FileProvider.getUriForFile(this, FileUtils.FILEPROVIDER, file);
+        Log.d(TAG, "Taking photo to URI: " + photoUri);
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+                .putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
+        startActivityForResult(intent, CAMERA_REQUEST_CODE);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java
index 356d65902..2fe06fbb1 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java
@@ -82,8 +82,7 @@ public class SaveActivity extends Activity {
             return;
         }
 
-        File directory = playTrack ? new File(getCacheDir(), FileUtils.PLAY_TRACKS_DIR)
-                : new File(FileUtils.getPath(trackFileFormat.getExtension()));
+        File directory = playTrack ? new File(getCacheDir(), FileUtils.PLAY_TRACKS_DIR) : new File(FileUtils.getPath(trackFileFormat.getExtension()));
         if (!FileUtils.ensureDirectoryExists(directory)) {
             Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
             finish();
@@ -96,8 +95,7 @@ public class SaveActivity extends Activity {
             }
         }
 
-        directoryDisplayName = playTrack ? directory.getName()
-                : FileUtils.getPathDisplayName(trackFileFormat.getExtension());
+        directoryDisplayName = playTrack ? directory.getName() : FileUtils.getPathDisplayName(trackFileFormat.getExtension());
 
         Object retained = getLastNonConfigurationInstance();
         if (retained instanceof SaveAsyncTask) {
diff --git a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
index 7290543e1..49d0fba4a 100644
--- a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
@@ -143,6 +143,8 @@ public class StatsUtils {
         setDistanceValue(context, getView(activity, view, R.id.stats_distance), totalDistance, metricUnits);
 
         // Set activity type
+        getView(activity, null, R.id.stats_activity_type_label).setVisibility(trackIconValue != null ? View.VISIBLE : View.GONE);
+
         Spinner spinner = (Spinner) getView(activity, view, R.id.stats_activity_type_icon);
         spinner.setVisibility(trackIconValue != null ? View.VISIBLE : View.GONE);
         if (trackIconValue != null) {
diff --git a/src/main/res/layout/stats_activity_type.xml b/src/main/res/layout/stats_activity_type.xml
index d433b13d0..7452912ea 100644
--- a/src/main/res/layout/stats_activity_type.xml
+++ b/src/main/res/layout/stats_activity_type.xml
@@ -17,7 +17,7 @@ limitations under the License.
     style="@style/StatsLargeItemContainer">
     <!-- Label -->
     <TextView
-        android:id="@+id/stats_label"
+        android:id="@+id/stats_activity_type_label"
         style="@style/StatsLargeLabel"
         android:text="@string/track_edit_activity_type_hint" />
     <!-- Value container -->
diff --git a/src/main/res/layout/stats_content.xml b/src/main/res/layout/stats_content.xml
index 7744a0f51..5fd89ba3e 100644
--- a/src/main/res/layout/stats_content.xml
+++ b/src/main/res/layout/stats_content.xml
@@ -24,7 +24,7 @@ limitations under the License.
             layout="@layout/stats_large_item" />
 
         <include
-            android:id="@+id/stats_calorie"
+            android:id="@+id/stats_activity_type"
             layout="@layout/stats_activity_type" />
     </LinearLayout>
     <!-- Total time and moving time -->