diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index b5c63aa0a..841ce9527 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -277,8 +277,35 @@ public void bindView(View view, Context context, Cursor cursor) {
                 return;
             }
 
-            // Show the notification dialog to select type of the metric to show in starting new track
-            showNotificationOptionsDialog();
+
+            // Not Recording -> Recording
+            try {
+                runOnUiThread(() -> {
+                    for (int i = selectedDelayInSeconds; i >= 0; i--) {
+
+                        final int secondsLeft = i;
+                        Toast toast = Toast.makeText(TrackListActivity.this,"Recording starts in " + secondsLeft + " seconds", Toast.LENGTH_SHORT);
+                        toast.show();
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException e) {
+                            throw new RuntimeException(e);
+                        }
+                        toast.cancel();
+                    }});
+
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            updateGpsMenuItem(false, true);
+            new TrackRecordingServiceConnection((service, connection) -> {
+               // Track.Id trackId = service.startNewTrack();
+                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
+                //newIntent.putExtra(TrackRecordingActivity.EXTRA_TRACK_ID, trackId);
+                startActivity(newIntent);
+
+                connection.unbind(this);
+            }).startAndBind(this, true);
         });
         viewBinding.trackListFabAction.setOnLongClickListener((view) -> {
             if (!recordingStatus.isRecording()) {
@@ -289,14 +316,29 @@ public void bindView(View view, Context context, Cursor cursor) {
             ActivityUtils.vibrate(this, 1000);
             updateGpsMenuItem(false, false);
             trackRecordingServiceConnection.stopRecording(TrackListActivity.this);
-            viewBinding.trackListFabAction.setImageResource(R.drawable.ic_baseline_record_24);
+            viewBinding.trackListFabAction.setImageResource(R.drawable.start);
             viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.red_dark));
             selectedDelayInSeconds=0;
             return true;
         });
 
         setSupportActionBar(viewBinding.trackListToolbar);
+        if (recordingStatus.isRecording()) {
+            Toast.makeText(TrackListActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        // Not Recording -> Recording
+        updateGpsMenuItem(false, true);
+        new TrackRecordingServiceConnection((service, connection) -> {
+            //Track.Id trackId = service.startNewTrack();
+
+            Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
+//            newIntent.putExtra(TrackRecordingActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(newIntent);
 
+            connection.unbind(this);
+        }).startAndBind(this, true);
         loadData(getIntent());
     }
 
@@ -656,7 +698,9 @@ public void onGpsStatusChanged(GpsStatusValue newStatus) {
     }
 
     private void setFloatButton() {
-        viewBinding.trackListFabAction.setImageResource(recordingStatus.isRecording() ? R.drawable.ic_baseline_stop_24 : R.drawable.ic_baseline_record_24);
+        viewBinding.trackListFabAction.setImageResource(recordingStatus.isRecording() ? R.drawable.stop : R.drawable.start);
+//        viewBinding.trackListFabAction.setTex
+
         viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, recordingStatus.isRecording() ? R.color.opentracks : R.color.red_dark));
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
index d6e686008..4a384d745 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -5,14 +5,15 @@
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -112,30 +113,40 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         contentProviderUtils = new ContentProviderUtils(this);
 
-        trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
-        if (trackId == null) {
-            throw new RuntimeException("TrackId is mandatory");
-        }
-        if (contentProviderUtils.getTrack(trackId) == null) {
-            Log.w(TAG, "TrackId does not exists.");
-            finish();
+        if(getIntent().getParcelableExtra(EXTRA_TRACK_ID)!=null){
+            trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
+            trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
         }
 
-        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
+
+//        if (trackId == null) {
+//            throw new RuntimeException("TrackId is mandatory");
+//        }
+//        if (contentProviderUtils.getTrack(trackId) == null) {
+//            Log.w(TAG, "TrackId does not exists.");
+//            finish();
+//        }
+
+
         trackDataHub = new TrackDataHub(this);
 
         CustomFragmentPagerAdapter pagerAdapter = new CustomFragmentPagerAdapter(this);
         viewBinding.trackDetailActivityViewPager.setAdapter(pagerAdapter);
-        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
-                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
-        if (savedInstanceState != null) {
-            viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
+//        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
+//                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
+//        if (savedInstanceState != null) {
+//            viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
+//        }
+
+        if(getIntent().getParcelableExtra(EXTRA_TRACK_ID)!=null){
+            viewBinding.trackRecordingFabAction.setImageResource(R.drawable.stop);
+        }else{
+            viewBinding.trackRecordingFabAction.setImageResource(R.drawable.start);
         }
 
-        viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_baseline_stop_24);
         viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks));
         viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks));
-        viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> {
+        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> {
             ActivityUtils.vibrate(this, 1000);
             trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this);
             Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackStoppedActivity.class)
@@ -143,14 +154,48 @@ protected void onCreate(Bundle savedInstanceState) {
             startActivity(newIntent);
             overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
             finish();
-            return true;
         });
+
         viewBinding.trackRecordingFabAction.setOnClickListener((view) -> Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show());
 
         viewBinding.bottomAppBar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24);
         setSupportActionBar(viewBinding.bottomAppBar);
+        setSupportActionBar(viewBinding.trackListToolbar);
+        viewBinding.trackRecordingFabAction.setOnClickListener(v -> startRecording(pagerAdapter));
+
+        viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> {
+            ActivityUtils.vibrate(this, 1000);
+            trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this);
+            Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackStoppedActivity.class)
+                    .putExtra(TrackStoppedActivity.EXTRA_TRACK_ID, trackId);
+            startActivity(newIntent);
+            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+            finish();
+            return true;
+        });
+
     }
+    void startRecording(CustomFragmentPagerAdapter pagerAdapter) {
+        if (recordingStatus.isRecording()) {
+            Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show();
+            return;
+        }
+        // Not Recording -> Recording
+        // updateGpsMenuItem(false, true);
+        new TrackRecordingServiceConnection((service, connection) -> {
+            trackId = service.startNewTrack();
+            trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
+            trackRecordingServiceConnection.startConnection(this);
+        }).startAndBind(this, true);
+
+        new TabLayoutMediator(viewBinding.trackDetailActivityTablayout, viewBinding.trackDetailActivityViewPager,
+                (tab, position) -> tab.setText(pagerAdapter.getPageTitle(position))).attach();
+        viewBinding.bottomAppBar.setVisibility(View.VISIBLE);
+
+        viewBinding.trackRecordingFabAction.setImageResource(R.drawable.stop);
+
 
+    }
     @Override
     public void onAttachedToWindow() {
         setLockscreenPolicy();
@@ -208,7 +253,10 @@ protected void onStart() {
 
         PreferencesUtils.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
 
-        trackRecordingServiceConnection.startConnection(this);
+        if (trackRecordingServiceConnection != null) {
+            trackRecordingServiceConnection.startConnection(this);
+        }
+
         trackDataHub.start();
     }
 
@@ -225,7 +273,10 @@ protected void onResume() {
             trackDataHub.setRecordingStatus(recordingStatus);
         }
 
-        trackRecordingServiceConnection.startAndBindWithCallback(this);
+        if (trackRecordingServiceConnection != null) {
+            trackRecordingServiceConnection.startAndBindWithCallback(this);
+        }
+
     }
 
     @Override
@@ -234,11 +285,19 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putInt(CURRENT_TAB_TAG_KEY, viewBinding.trackDetailActivityViewPager.getCurrentItem());
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (trackRecordingServiceConnection != null) {
+            trackRecordingServiceConnection.unbind(this);
+        }
+    }
+
     @Override
     protected void onStop() {
         super.onStop();
         PreferencesUtils.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        trackRecordingServiceConnection.unbind(this);
+
         trackDataHub.stop();
     }
 
@@ -257,7 +316,7 @@ protected View getRootView() {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.track_record, menu);
+        getMenuInflater().inflate(R.menu.track_menu_custom, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -305,6 +364,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return true;
         }
 
+        if (item.getItemId() == R.id.track_list_settings) {
+            startActivity(IntentUtils.newIntent(this, SettingsActivity.class));
+            return true;
+        }
+
+
+        if (item.getItemId() == R.id.track_list_help) {
+            startActivity(IntentUtils.newIntent(this, HelpActivity.class));
+            return true;
+        }
+
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
index 03ddd5fc4..668f46996 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -5,6 +5,7 @@
 import android.util.Log;
 import android.util.Pair;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ArrayAdapter;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -96,7 +97,10 @@ protected void onCreate(Bundle savedInstanceState) {
             finish();
         });
 
-        viewBinding.resumeButton.setOnClickListener(v -> {
+
+        Button resumeButton = findViewById(R.id.resume_button);
+        resumeButton.setText("RESUME");
+        resumeButton.setOnClickListener(v -> {
             storeTrackMetaData(contentProviderUtils, track);
             resumeTrackAndFinish();
         });
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 814109143..9036eaa86 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -119,7 +119,7 @@ public void onCreate() {
     @Override
     public void onDestroy() {
         Log.d(TAG, "Destroying");
-        if (isRecording()) {
+        if (recordingStatus.isRecording()) {
             endCurrentTrack();
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java
index 34b8c4991..59964ea98 100644
--- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java
+++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java
@@ -183,6 +183,8 @@ public void announce(@NonNull Track track) {
             }
         }
 
+
+
         if (Arrays.asList(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION)
                 .contains(audioManager.getMode())) {
             Log.i(TAG, "Announcement is not allowed at this time.");
@@ -200,6 +202,8 @@ public void announce(@NonNull Track track) {
             return;
         }
 
+
+
         Distance currentIntervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
         if (currentIntervalDistance != intervalDistance) {
             intervalStatistics = new IntervalStatistics(currentIntervalDistance);
@@ -215,7 +219,10 @@ public void announce(@NonNull Track track) {
             sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
         }
 
-        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
+//        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
+       // SpannableStringBuilder announcement = new SpannableStringBuilder();
+        Spannable announcement = VoiceAnnouncementUtils.getMotivationalAnnouncements();
+     //   announcement.append("good job");
 
         if (announcement.length() > 0) {
             // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.
diff --git a/src/main/res/drawable/ic_baseline_play_arrow_24.xml b/src/main/res/drawable/ic_baseline_play_arrow_24.xml
new file mode 100644
index 000000000..88a06e5d4
--- /dev/null
+++ b/src/main/res/drawable/ic_baseline_play_arrow_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/src/main/res/drawable/start.xml b/src/main/res/drawable/start.xml
new file mode 100644
index 000000000..c2604bd10
--- /dev/null
+++ b/src/main/res/drawable/start.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1080dp"
+    android:height="1080dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <path
+      android:pathData="M685.2,369.9C686.6,369.8 686.6,369.8 688,369.8C691.2,369.8 694.3,369.8 697.5,369.8C699.7,369.8 701.9,369.8 704.1,369.8C708.7,369.8 713.4,369.8 718,369.8C723.9,369.8 729.8,369.8 735.7,369.8C740.2,369.8 744.8,369.8 749.3,369.8C751.5,369.8 753.7,369.8 755.8,369.8C771.3,369.7 786.5,370.1 801.5,374.1C802.7,374.4 802.7,374.4 803.9,374.8C815,377.9 826.3,383.2 835,391C835.8,391.7 836.6,392.5 837.5,393.2C852.3,407.3 857.8,425.7 858.4,445.7C858.5,464.9 854.1,482.2 843,498C842.5,498.8 842,499.5 841.4,500.3C840.9,500.9 840.5,501.4 840,502C839.3,502 838.7,502 838,502C837.7,502.6 837.5,503.3 837.2,503.9C836,506 836,506 833,507C833,507.7 833,508.3 833,509C823.6,516.5 809.4,526 797,526C801.3,533.9 805.7,541.7 810.2,549.5C811.2,551.2 811.2,551.2 812.2,552.9C813.5,555.2 814.8,557.5 816.1,559.8C817.8,562.7 819.5,565.6 821.2,568.5C825.5,576 829.8,583.3 834.5,590.5C836.6,593.9 838.5,597.5 840.3,601C842.3,604.5 844.4,608 846.5,611.5C849.6,616.7 852.6,621.9 855.4,627.2C857.9,631.7 860.7,636 863.5,640.3C865,643 865,643 865,646C859.5,646.3 853.9,646.6 848.3,646.7C846.5,646.8 844.6,646.9 842.7,647C830.3,647.7 830.3,647.7 825,646C820.8,642.3 819.1,638.1 817,633C815.9,631 814.7,629 813.6,627C812.5,625 811.4,623 810.3,621C809,618.8 807.8,616.6 806.6,614.4C806,613.3 805.4,612.2 804.7,611.1C802.2,606.6 799.6,602.1 797.1,597.6C796.6,596.7 796.1,595.9 795.6,595C792.9,590.3 790.2,585.5 787.4,580.8C780.9,569.6 774.5,558.4 768.2,547.1C767.6,546.1 767,545 766.4,543.9C764.2,540 762,536 760,532C743.8,532 727.7,532 711,532C711,544.1 711,544.1 711,556.4C711,561.5 711,566.6 711,571.7C711.1,579.8 711.1,587.9 711.1,596C711.1,602.5 711.1,609 711.1,615.6C711.1,618.1 711.1,620.6 711.1,623C711.1,626.5 711.1,630 711.1,633.5C711.1,634.5 711.1,635.6 711.1,636.6C711.1,637.6 711.1,638.5 711.1,639.5C711.1,640.3 711.1,641.2 711.1,642C711,644 711,644 710,646C705,646 700.1,646 695.1,646.1C693.4,646.1 691.7,646.1 690,646.1C687.6,646.1 685.2,646.1 682.8,646.1C681.6,646.1 681.6,646.1 680.4,646.1C678.6,646.1 676.8,646.1 675,646C674,645 674,645 673.9,643.1C673.9,642.3 673.9,641.5 673.9,640.6C673.9,639.6 673.9,638.7 673.9,637.7C673.9,636.6 673.9,635.6 673.9,634.5C673.9,633.4 673.9,632.2 673.9,631.1C673.9,627.3 673.9,623.5 673.9,619.7C673.9,617 673.9,614.3 673.9,611.6C673.9,605.8 673.9,600 673.9,594.2C673.9,585.7 673.9,577.3 673.9,568.9C673.9,555.2 673.9,541.5 673.9,527.9C673.9,514.6 673.9,501.3 673.9,488C673.9,487.2 673.9,486.4 673.9,485.5C673.9,481.4 673.9,477.3 673.9,473.2C674,439.1 674,405.1 674,371C677.4,369.3 681.4,369.9 685.2,369.9ZM710,400C710.1,413 710.2,426 710.3,439.1C710.4,445.1 710.4,451.2 710.5,457.2C710.5,463 710.6,468.9 710.7,474.7C710.7,476.9 710.7,479.1 710.7,481.4C710.7,484.5 710.8,487.6 710.8,490.7C710.8,491.6 710.8,492.6 710.8,493.5C710.5,497.6 710.5,497.6 712,501C713.5,501.1 715.1,501.1 716.6,501.2C717.6,501.2 718.5,501.2 719.6,501.2C720.6,501.2 721.7,501.2 722.8,501.2C723.9,501.2 725,501.2 726.2,501.2C728.5,501.2 730.9,501.2 733.2,501.2C736.8,501.2 740.3,501.3 743.9,501.3C766.8,501.4 791.4,500.7 809,484.1C819.2,473.2 822.7,459.1 822.3,444.4C821.2,431.7 816.8,420.8 807.5,412C793.9,401.1 775.6,399.7 758.9,399.8C757.5,399.8 756.1,399.8 754.7,399.8C751,399.8 747.3,399.8 743.6,399.9C739.8,399.9 736,399.9 732.2,399.9C724.8,399.9 717.4,400 710,400Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M512.4,369.8C513.2,369.8 514.1,369.7 514.9,369.7C516.7,369.7 518.5,369.7 520.2,369.7C522.9,369.7 525.6,369.6 528.3,369.6C530,369.6 531.8,369.6 533.5,369.6C534.3,369.6 535.1,369.5 535.9,369.5C541.5,369.5 541.5,369.5 543.9,371.6C545.3,374.7 546.4,377.7 547.5,380.9C547.7,381.6 547.9,382.3 548.1,383C548.6,384.5 549.1,386 549.6,387.5C550.9,391.6 552.3,395.6 553.6,399.7C553.9,400.5 554.2,401.4 554.4,402.3C557.2,410.6 560,419 562.9,427.3C567.3,439.9 571.6,452.6 575.6,465.3C577,470 578.5,474.6 580.3,479.1C585.4,492.6 589.8,506.5 594.4,520.2C598.4,532.2 602.4,544.1 606.5,556C612,572.1 617.4,588.2 622.8,604.3C624.6,609.7 626.4,615.1 628.2,620.5C629,622.8 629.7,625.1 630.5,627.4C631,628.9 631.5,630.3 632,631.8C632.7,633.8 633.3,635.8 634,637.9C634.4,639 634.8,640.1 635.2,641.3C636,644 636,644 636,646C623.1,646 610.3,646 597,646C588.5,618.6 588.5,618.6 585.1,606.6C584.1,603.4 583,600.2 581.8,597.1C580.4,593.4 579.2,589.6 578,585.8C577.8,585.1 577.5,584.3 577.3,583.5C575.1,576.7 573.6,570 572,563C539,563 506,563 472,563C471.5,566 471.5,566 471,569C470.7,570.3 470.3,571.7 469.9,573C469.7,573.8 469.5,574.5 469.2,575.3C469,576.1 468.8,576.9 468.5,577.7C468.2,578.5 468,579.4 467.7,580.3C465,589 462.1,597.7 459.2,606.4C456.9,613.2 454.8,619.9 452.9,626.8C451.8,630.7 450.6,634.5 449.3,638.3C449.1,639 448.9,639.6 448.7,640.3C447.1,644.9 447.1,644.9 446,646C443.3,646.1 440.7,646.1 438,646.1C437.2,646.1 436.4,646.1 435.6,646.1C433.1,646.1 430.5,646.1 427.9,646.1C426.2,646.1 424.5,646.1 422.7,646C418.5,646 414.2,646 410,646C410.6,640.9 411.7,636.2 413.4,631.4C413.6,630.7 413.9,630 414.1,629.2C414.9,627 415.6,624.8 416.4,622.6C416.9,621.1 417.4,619.6 417.9,618.1C418.4,616.6 418.8,615.2 419.3,613.8C419.6,613.1 419.8,612.4 420,611.8C421.2,608.4 422.3,605 423.6,601.7C425.2,597.4 426.5,593 427.8,588.5C428.7,585.8 429.7,583.2 430.8,580.6C433.4,574.1 435.6,567.5 437.7,560.9C438.5,558.6 439.3,556.2 440.1,553.8C441.2,550.5 442.3,547.2 443.4,543.9C445.9,536.3 448.4,528.7 450.9,521.1C451.2,520.4 451.4,519.7 451.7,518.9C455.8,506.4 460.1,493.9 464.4,481.4C468.2,470.4 471.9,459.4 475.6,448.3C480.6,433.3 485.7,418.2 490.9,403.2C492.3,399.2 493.7,395.1 495,391C495.7,389.1 496.3,387.2 496.9,385.4C497.7,383.1 498.5,380.8 499.2,378.6C499.7,377.1 499.7,377.1 500.3,375.6C500.5,374.7 500.8,373.8 501.1,372.9C503.1,368.5 508.2,369.8 512.4,369.8ZM521,400C520.9,400.6 520.7,401.2 520.6,401.8C512.9,433.2 503.2,464 493.3,494.7C489.1,507.4 485.2,520.1 482,533C508.4,533 534.8,533 562,533C558.9,520.4 558.9,520.4 555.4,508C555.2,507.3 555,506.7 554.8,506C553.7,502 552.3,498.2 550.9,494.4C548.9,488.9 547.2,483.2 545.4,477.6C545.2,476.9 545,476.2 544.8,475.5C541.4,464.5 538.1,453.5 534.8,442.5C534.6,441.8 534.4,441.1 534.2,440.4C532.1,433.1 530,425.9 527.9,418.6C527.6,417.5 527.2,416.3 526.9,415.2C526.3,413.1 525.7,411.1 525.2,409C524.9,408.1 524.6,407.2 524.4,406.3C524.2,405.5 523.9,404.7 523.7,403.9C523.1,401.8 523.1,401.8 521,400Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M175,390.3C177.1,392.1 177.1,392.1 180,394C180,394.7 180,395.3 180,396C182,397 182,397 184,398C182.5,401.3 180.6,403.9 178.3,406.7C174.9,410.8 171.7,415 168.5,419.3C167,421 167,421 164,422C161.8,420.6 159.8,419.2 157.8,417.6C152.6,413.7 147.4,410.4 141.6,407.6C141,407.2 140.3,406.9 139.7,406.6C121.3,397.7 100.4,395.1 80.6,401C69.3,405.1 60,411.3 54.6,422.4C51.5,430.9 51.5,441.9 54.4,450.4C64.4,470.9 90.1,478.4 109.6,486.7C110.8,487.2 110.8,487.2 111.9,487.7C115.7,489.3 119.5,490.9 123.3,492.5C150.3,503.9 177,516.5 189,545C196,563.3 195.1,584.3 187.2,602.2C183.7,609.8 179.7,616.7 174,623C173.5,623.6 173,624.2 172.5,624.8C164.5,633.5 153.9,639.7 143,644C142.2,644.4 141.3,644.7 140.5,645.1C132.3,648.4 123.7,649.7 115,651C113.8,651.2 112.7,651.4 111.4,651.6C78.2,655.7 44.6,644.6 18,625C17.1,624.4 16.3,623.7 15.4,623.1C10.7,619.5 10.7,619.5 9,618C9,617.3 9,616.7 9,616C8.4,615.7 7.8,615.5 7.2,615.2C5,614 3.5,613.1 2,611C2.4,607.7 3.5,606.2 6,603.9C10.1,600 13.6,595.8 17.1,591.4C19,589 19,589 21,587C24.4,587.3 25.9,588.6 28.1,591.1C40.5,603.9 58,611.6 75,616C75.9,616.2 76.8,616.5 77.7,616.7C96.7,621.1 118.4,619.9 135.7,610.4C145,604.6 150.3,597.2 154,587C156.4,575.7 155.1,563.4 149.5,553.2C138.9,537.4 117.6,530.8 100.9,523.9C95.3,521.6 89.9,519.1 84.5,516.6C80.7,514.8 76.9,513.1 73.1,511.5C51.2,502.2 51.2,502.2 43,495C43,494.3 43,493.7 43,493C42.1,492.5 42.1,492.5 41.1,492.1C39.8,491.4 38.4,490.7 37,490C37,489.3 37,488.7 37,488C36.4,487.8 35.8,487.5 35.2,487.3C25.5,481.8 20,467.5 16.8,457.3C12,438.6 15.4,419.4 24.8,402.8C37.3,383 56.9,372.7 79,367C112.3,360.5 148.9,368.3 175,390.3Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M218.4,369.9C219.1,369.9 219.9,369.9 220.7,369.9C221.5,369.9 222.3,369.9 223.2,369.9C225.9,369.9 228.7,369.9 231.4,369.9C233.4,369.9 235.4,369.8 237.3,369.8C242.7,369.8 248.1,369.8 253.4,369.8C257.9,369.8 262.4,369.8 266.8,369.8C277.4,369.8 287.9,369.8 298.4,369.8C309.3,369.8 320.2,369.8 331.1,369.8C340.4,369.8 349.7,369.8 359,369.8C364.6,369.8 370.2,369.8 375.8,369.8C381,369.7 386.3,369.7 391.5,369.8C393.4,369.8 395.4,369.8 397.3,369.7C399.9,369.7 402.5,369.7 405.2,369.8C405.9,369.7 406.7,369.7 407.5,369.7C412.8,369.8 412.8,369.8 415,372C415.2,374.7 415.2,374.7 415.2,378C415.2,379.2 415.2,380.4 415.2,381.7C415.2,382.9 415.2,384.2 415.2,385.5C415.2,387.4 415.2,387.4 415.2,389.3C415.1,398.7 415.1,398.7 414,401C386.9,401.3 359.9,401.7 332,402C332,409.3 332,416.6 332,424.2C332,447.6 332,471 332.1,494.4C332.1,498 332.1,501.7 332.1,505.3C332.1,506 332.1,506.7 332.1,507.5C332.1,519.2 332.1,530.9 332.1,542.6C332.1,554.7 332.1,566.7 332.1,578.7C332.1,585.5 332.1,592.2 332.1,599C332.1,605.3 332.1,611.7 332.1,618C332.1,620.4 332.1,622.7 332.1,625C332.1,628.2 332.1,631.4 332.1,634.6C332.1,635.5 332.1,636.4 332.1,637.4C332.1,638.3 332.1,639.1 332.1,640C332.1,640.7 332.1,641.4 332.1,642.2C332,644 332,644 331,646C319.1,646 307.2,646 295,646C294.7,565.5 294.3,485 294,402C267.3,401.7 240.5,401.3 213,401C211.1,399.1 211.9,396.1 211.9,393.6C211.9,392.3 211.9,391 211.9,389.7C211.9,389 211.9,388.3 211.9,387.6C211.9,385.5 211.9,383.4 211.9,381.3C211.9,380 211.9,378.7 211.9,377.4C211.9,376.2 211.9,375 211.9,373.8C212.1,369 214.1,369.9 218.4,369.9Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M883,370C885.7,369.7 888.1,369.6 890.7,369.6C891.5,369.6 892.3,369.6 893.2,369.6C895.9,369.6 898.6,369.6 901.3,369.7C903.3,369.7 905.2,369.7 907.1,369.7C912.4,369.7 917.7,369.7 923,369.7C928.5,369.7 934,369.7 939.5,369.7C950,369.7 960.4,369.8 970.9,369.8C982.8,369.8 994.7,369.8 1006.6,369.8C1031,369.9 1055.5,369.9 1080,370C1080,380.2 1080,390.5 1080,401C1053.9,401 1027.9,401 1001,401C1001,408.4 1001,415.8 1001,423.4C1001,447 1001,470.6 1001.1,494.2C1001.1,497.9 1001.1,501.5 1001.1,505.2C1001.1,505.9 1001.1,506.7 1001.1,507.4C1001.1,519.2 1001.1,531.1 1001.1,542.9C1001.1,555 1001.1,567.1 1001.1,579.3C1001.1,586.8 1001.1,594.2 1001.1,601.7C1001.1,607.5 1001.1,613.2 1001.1,618.9C1001.1,621.3 1001.1,623.6 1001.1,626C1001.1,629.2 1001.1,632.4 1001.1,635.6C1001.1,636.6 1001.1,637.5 1001.1,638.5C1001.1,644.9 1001.1,644.9 1000,646C988.1,646 976.2,646 964,646C964,565.2 964,484.3 964,401C936.9,401 909.9,401 882,401C880.3,396 880.8,390.8 880.8,385.5C880.8,384.3 880.8,383.2 880.8,382C880.8,380.9 880.8,379.8 880.8,378.7C880.8,377.6 880.8,376.6 880.8,375.6C881,373 881,373 883,370Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/src/main/res/drawable/stop.xml b/src/main/res/drawable/stop.xml
new file mode 100644
index 000000000..7df5edba9
--- /dev/null
+++ b/src/main/res/drawable/stop.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1080dp"
+    android:height="1080dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <path
+      android:pathData="M651.3,337.7C652.3,337.7 652.3,337.7 653.5,337.7C664.2,337.7 674.5,338.2 685,341C685.7,341.2 686.3,341.4 687,341.5C720.3,350.6 747.8,371.2 765.1,401.2C793.3,452 795.3,514.8 779.7,569.9C773.6,590 763.4,608.9 750,625C749.3,625.9 748.5,626.8 747.8,627.7C734.7,642.9 717.6,654 699,661C698.1,661.4 698.1,661.4 697.1,661.7C665.3,673.6 627.6,671.6 596.8,657.9C563.9,642.8 540.3,613.8 527.8,580.3C508.7,526.7 509.3,462.8 533.4,410.9C538.9,399.6 545.9,389.7 554,380C554.6,379.2 555.3,378.5 555.9,377.7C570.5,360.5 590.8,349.2 612.1,342.7C612.9,342.4 613.7,342.2 614.5,342C626.6,338.4 638.7,337.6 651.3,337.7ZM586.7,403.4C574,418.3 566.6,437.2 562.2,456.1C562,456.9 561.8,457.7 561.6,458.6C558.5,472.9 557.6,487.1 557.7,501.7C557.7,502.5 557.7,503.2 557.7,504.1C557.7,516.9 558.4,529.4 561,542C561.2,542.8 561.3,543.7 561.5,544.5C566.3,567.7 575.1,590 592,607C593.3,608.3 593.3,608.3 594.6,609.7C595.8,610.8 595.8,610.8 597,612C597.5,612.5 598,613 598.6,613.6C612.9,627.3 633.5,633.1 653,633C674.3,632.2 691.8,624.7 708,611C708.7,610.4 709.3,609.9 710,609.3C736.6,584.7 744.3,543.8 745.9,509.4C747,472.3 740.7,431.2 715.4,402.6C713.9,401 712.5,399.5 711,398C710.4,397.4 709.9,396.7 709.3,396.1C697.1,382.9 677.5,374.8 659.7,373.9C630.4,373 606.9,381.9 586.7,403.4Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M862.3,342.7C863.1,342.7 864,342.7 865,342.7C865.9,342.7 866.9,342.7 867.9,342.7C869.5,342.7 869.5,342.7 871.1,342.7C874.5,342.7 877.9,342.7 881.4,342.7C883.8,342.7 886.2,342.7 888.6,342.7C893.6,342.7 898.6,342.7 903.7,342.7C910.1,342.8 916.5,342.7 922.9,342.7C927.9,342.7 932.8,342.7 937.8,342.7C940.1,342.7 942.5,342.7 944.9,342.7C980.5,342.7 1018.5,346.2 1045.4,372.3C1047,373.8 1048.5,375.4 1050,377C1050.6,377.7 1051.3,378.3 1051.9,379C1057.7,385.7 1060.9,394.8 1064,403C1064.2,403.6 1064.5,404.3 1064.7,404.9C1073.2,428.3 1069.9,460.5 1059.7,482.7C1056.8,488.3 1053.8,493.9 1050,499C1049.3,499 1048.7,499 1048,499C1047.8,499.6 1047.5,500.1 1047.3,500.7C1045.6,503.6 1043.5,505.7 1041,508C1040.4,508.6 1039.9,509.2 1039.3,509.8C1038,511 1038,511 1036,511C1036,511.7 1036,512.3 1036,513C1033.7,514.7 1031.3,516.2 1028.9,517.8C1028.2,518.2 1027.4,518.6 1026.7,519.1C1020,523.1 1013.3,526.3 1006,529C1005,529.4 1004.1,529.7 1003.1,530.1C980.8,537.9 957.2,537.5 933.8,537.3C929.8,537.2 925.7,537.2 921.7,537.2C913.8,537.2 905.9,537.1 898,537C898.3,537.7 898.7,538.3 899,539C899.1,540.6 899.1,542.2 899.1,543.8C899.1,544.8 899.1,545.8 899.1,546.9C899.1,548 899.1,549.1 899.1,550.3C899.1,551.5 899.1,552.6 899.1,553.8C899.1,557.1 899.1,560.3 899.1,563.5C899.1,566.9 899.1,570.3 899.1,573.7C899.1,579.3 899.1,585 899.1,590.7C899.1,597.2 899.1,603.8 899.1,610.4C899.1,616 899.1,621.6 899.1,627.2C899.1,630.6 899.1,634 899.1,637.3C899.1,641.1 899.1,644.8 899.1,648.6C899.1,649.7 899.1,650.8 899.1,652C899.1,653 899.1,654 899.1,655.1C899.1,655.9 899.1,656.8 899.1,657.7C899,660 899,660 898,663C884.5,663 870.9,663 857,663C855.7,660.5 855.9,658.7 855.9,655.8C855.9,654.7 855.9,653.6 855.9,652.5C855.9,651.3 855.9,650 855.9,648.8C855.9,647.5 855.9,646.2 855.9,644.9C855.9,641.3 855.9,637.7 855.9,634.1C855.9,630.2 855.8,626.3 855.8,622.5C855.8,614.9 855.8,607.3 855.8,599.7C855.8,593.5 855.8,587.4 855.8,581.2C855.8,563.7 855.8,546.3 855.8,528.8C855.8,527.9 855.8,526.9 855.8,525.9C855.8,525 855.8,524.1 855.8,523.1C855.8,507.8 855.8,492.5 855.8,477.2C855.8,461.5 855.8,445.8 855.8,430.1C855.8,421.3 855.8,412.5 855.8,403.7C855.7,396.2 855.7,388.7 855.8,381.2C855.8,377.3 855.8,373.5 855.7,369.7C855.7,365.5 855.7,361.4 855.8,357.2C855.7,356 855.7,354.8 855.7,353.5C855.7,352.4 855.7,351.3 855.8,350.2C855.8,349.2 855.8,348.3 855.8,347.3C856.2,343 858.5,342.7 862.3,342.7ZM899,377C897.8,379.5 897.9,381.1 897.9,383.9C897.9,384.9 897.9,386 897.9,387C897.9,388.2 897.9,389.3 897.9,390.5C897.9,391.7 897.9,392.9 897.9,394.1C897.9,397.4 897.9,400.7 897.9,404C897.9,407.4 897.9,410.9 897.9,414.3C897.9,420.1 897.9,425.9 897.9,431.6C897.9,438.3 897.9,445 897.9,451.7C897.9,457.4 897.9,463.2 897.9,468.9C897.9,472.3 897.9,475.7 897.9,479.2C897.9,483 897.9,486.8 897.9,490.6C897.9,491.8 897.9,492.9 897.9,494.1C897.9,495.1 897.9,496.2 897.9,497.2C897.9,498.1 897.9,499 897.9,500C897.8,502 897.8,502 899,503C900.7,503.1 902.3,503.1 904,503.1C905.6,503.2 905.6,503.2 907.2,503.2C908.4,503.2 909.5,503.2 910.7,503.2C912.5,503.2 912.5,503.2 914.3,503.2C916.9,503.2 919.5,503.2 922,503.2C925.9,503.2 929.7,503.2 933.6,503.2C960.2,503.3 991.6,503.1 1012,483C1026.8,465.7 1027.5,444.6 1026,423C1024.2,409.8 1017.5,399.2 1007.4,390.7C999.4,384.9 990.5,382.4 981,380C980.2,379.8 979.4,379.6 978.6,379.3C961.1,375.2 941.5,376.9 923.8,376.9C921.3,376.9 918.9,376.9 916.5,377C910.7,377 904.8,377 899,377Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M160,341C160.8,341.2 161.6,341.5 162.5,341.7C183.9,348 205.9,358 221,375C221,378.9 219.7,379.9 217.2,382.9C216,384.3 216,384.3 214.7,385.8C214.3,386.3 213.8,386.8 213.4,387.4C211.9,389.1 210.5,390.8 209,392.6C208,393.8 207,394.9 206.1,396.1C205.6,396.7 205.1,397.3 204.6,397.8C201.2,401.9 201.2,401.9 199,403C198.1,402.3 197.2,401.6 196.2,400.9C171.8,382.5 145.7,372 114.7,375.2C99.9,377.3 86.2,382.9 76.5,394.7C69.6,405.1 67.5,417.2 69.6,429.4C72.9,442.1 81.1,451.1 91.9,458C109.8,468.4 129.3,475.9 148.4,483.8C160.4,488.8 172.2,493.9 183.7,499.9C184.6,500.3 185.4,500.8 186.3,501.2C193.5,505.1 199.8,509.6 206,515C206.8,515.7 207.6,516.4 208.5,517.1C223.9,531.4 231.3,551.2 232.3,571.8C233,596.7 226,619.2 208.9,637.7C187.1,660.1 156.1,668.7 125.6,669.2C100.8,669.4 77.5,664.7 55,654C54.3,653.7 53.7,653.4 53,653.1C37,645.4 23.7,634.2 11,622C12.7,617.8 15.6,614.7 18.6,611.4C19.4,610.5 19.4,610.5 20.2,609.5C24.7,604.3 29.3,599.1 34,594C35.3,595.1 35.3,595.1 36.6,596.3C38.1,597.5 39.5,598.8 41,600C42,600.8 43,601.7 44,602.5C69.9,623.8 102.1,634.5 135.7,631.4C152.5,629.5 169.1,623.5 180,610C188,598.4 190.5,585.6 188.5,571.7C186,559.1 179.8,549.7 169.4,542.1C150.7,530 129.2,522 108.9,513.1C104.9,511.4 101,509.7 97,508C95.8,507.5 95.8,507.5 94.5,506.9C92.1,505.9 89.7,504.8 87.3,503.8C86.6,503.4 85.9,503.1 85.1,502.8C61.7,492.5 40.9,475.4 31.1,451.3C23.9,432.3 24.6,409.4 32.8,390.9C36.3,383.2 40.3,376.2 46,370C46.7,369.2 47.4,368.4 48.1,367.6C75,338.9 122.9,330.4 160,341Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M255,343C284.5,343 314,343 343.6,342.9C347,342.9 350.5,342.9 354,342.9C354.7,342.9 355.4,342.9 356.1,342.9C367.3,342.9 378.6,342.9 389.8,342.9C401.3,342.9 412.9,342.9 424.4,342.9C430.9,342.9 437.3,342.9 443.8,342.9C449.9,342.9 456,342.9 462.1,342.9C464.3,342.9 466.6,342.9 468.8,342.9C471.9,342.9 474.9,342.9 478,342.9C478.8,342.9 479.7,342.9 480.7,342.9C486.8,342.9 486.8,342.9 489,344C489,355.2 489,366.4 489,378C442,378.5 442,378.5 394,379C394,387.6 393.9,396.1 393.9,405C393.8,432.3 393.8,459.7 393.7,487.1C393.7,491.4 393.6,495.6 393.6,499.9C393.6,500.7 393.6,501.5 393.6,502.4C393.6,516.1 393.5,529.9 393.5,543.6C393.5,557.6 393.4,571.7 393.4,585.8C393.3,594.5 393.3,603.1 393.3,611.8C393.3,617.8 393.2,623.7 393.2,629.7C393.2,633.1 393.2,636.5 393.2,640C393.2,643.7 393.2,647.4 393.2,651.1C393.2,652.2 393.2,653.3 393.2,654.5C393.1,655.5 393.1,656.4 393.1,657.5C393.1,658.3 393.1,659.2 393.1,660.1C393,662 393,662 392,663C389,663.1 386,663.1 383,663.1C382.1,663.1 381.2,663.1 380.2,663.1C378.3,663.1 376.4,663.1 374.5,663.1C371.5,663.1 368.6,663.1 365.6,663.1C363.8,663.1 361.9,663.1 360,663.1C358.7,663.1 358.7,663.1 357.3,663.1C351.1,663.1 351.1,663.1 350,662C349.9,660.5 349.9,659 349.9,657.5C349.9,656.5 349.9,655.5 349.8,654.5C349.8,653.4 349.8,652.3 349.8,651.1C349.8,650 349.8,648.8 349.8,647.6C349.8,644.4 349.8,641.2 349.8,638C349.8,634.5 349.8,631 349.8,627.5C349.7,621.5 349.7,615.5 349.7,609.5C349.7,600.8 349.7,592.1 349.6,583.4C349.6,569.3 349.5,555.1 349.5,541C349.5,527.3 349.4,513.6 349.4,499.9C349.4,499 349.4,498.2 349.4,497.3C349.4,493.1 349.3,488.8 349.3,484.6C349.2,449.4 349.1,414.2 349,379C302.5,378.5 302.5,378.5 255,378C253.5,375 253.9,372.4 253.9,369.1C253.9,368.4 253.9,367.7 253.9,367C253.9,365.6 253.9,364.2 253.9,362.7C253.9,360.5 253.9,358.3 253.9,356.1C253.9,354.7 253.9,353.3 253.9,351.9C253.9,350.6 253.9,349.4 253.9,348C254,345 254,345 255,343Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/src/main/res/layout/interval_list_view.xml b/src/main/res/layout/interval_list_view.xml
index aaf36bd8b..f518f9f8c 100644
--- a/src/main/res/layout/interval_list_view.xml
+++ b/src/main/res/layout/interval_list_view.xml
@@ -14,7 +14,7 @@
         android:layout_marginBottom="8dp"
         android:hint="@string/stats_split_interval">
 
-        <de.dennisguse.opentracks.ui.util.AutoCompleteTextViewForDropdown
+    <de.dennisguse.opentracks.ui.util.AutoCompleteTextViewForDropdown
             android:id="@+id/intervals_dropdown"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/statistics_recorded.xml b/src/main/res/layout/statistics_recorded.xml
index 4013cab2c..188d5a543 100644
--- a/src/main/res/layout/statistics_recorded.xml
+++ b/src/main/res/layout/statistics_recorded.xml
@@ -123,7 +123,8 @@
             app:layout_constraintStart_toEndOf="@id/guideline"
             app:layout_constraintEnd_toStartOf="@id/stats_distance_unit"
             app:layout_constraintTop_toBottomOf="@id/stats_distance_label"
-            tools:text="100" />
+            tools:text="100"
+            />
 
         <TextView
             android:id="@+id/stats_distance_unit"
diff --git a/src/main/res/layout/track_recording.xml b/src/main/res/layout/track_recording.xml
index 360a056dc..b479ae259 100644
--- a/src/main/res/layout/track_recording.xml
+++ b/src/main/res/layout/track_recording.xml
@@ -1,16 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="709dp"
         android:orientation="vertical"
         android:paddingBottom="90dp">
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/track_list_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:menu="@menu/track_menu_custom"
+                app:navigationIcon="@drawable/ic_logo_color_24dp"
+                app:title="@string/app_name" />
+        </com.google.android.material.appbar.AppBarLayout>
+
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/track_detail_activity_tablayout"
             android:layout_width="match_parent"
@@ -37,15 +50,15 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         app:fabAlignmentMode="end"
-        app:navigationIcon="@drawable/ic_logo_color_24dp"
-        app:menu="@menu/track_record" />
+        app:menu="@menu/track_record"
+        app:navigationIcon="@drawable/ic_logo_color_24dp" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/track_recording_fab_action"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_baseline_record_24"
         android:contentDescription="@string/image_stop"
+        android:src="@drawable/ic_baseline_record_24"
         app:layout_anchor="@id/bottom_app_bar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_stopped.xml b/src/main/res/layout/track_stopped.xml
index 4aca4c419..f98467dc6 100644
--- a/src/main/res/layout/track_stopped.xml
+++ b/src/main/res/layout/track_stopped.xml
@@ -197,10 +197,11 @@
                     app:tint="?attr/colorOnBackground"
                     app:srcCompat="@drawable/ic_delete_forever_24dp" />
 
-                <ImageView
+                <Button
                     android:id="@+id/resume_button"
-                    android:layout_width="64dp"
-                    android:layout_height="64dp"
+                    android:layout_width="120dp"
+                    android:layout_height="54dp"
+                    android:text=""
                     android:contentDescription="@string/image_record"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@id/buttons_guideline"
@@ -208,6 +209,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_button_resume" />
 
+
                 <ImageView
                     android:id="@+id/finish_button"
                     android:layout_width="64dp"
diff --git a/src/main/res/menu/track_menu_custom.xml b/src/main/res/menu/track_menu_custom.xml
new file mode 100644
index 000000000..ed2c7800b
--- /dev/null
+++ b/src/main/res/menu/track_menu_custom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!-- TODO SearchAction is only working if it is shown as action. However, only two slots are available. See  #757. -->
+    <item
+        android:id="@+id/track_list_settings"
+        android:icon="@drawable/ic_settings_24dp"
+        android:title="@string/menu_settings" />
+    <item
+        android:id="@+id/track_list_help"
+        android:icon="@drawable/ic_help_24dp"
+        android:title="@string/menu_help" />
+
+</menu>
\ No newline at end of file