diff --git a/app/res/drawable-mdpi/tab_selected_focused_holo.9.png b/app/res/drawable-mdpi/tab_selected_focused_holo.9.png
deleted file mode 100644
index 0894bfb09..000000000
Binary files a/app/res/drawable-mdpi/tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_selected_holo.9.png b/app/res/drawable-mdpi/tab_selected_holo.9.png
deleted file mode 100644
index 7982f6837..000000000
Binary files a/app/res/drawable-mdpi/tab_selected_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_selected_pressed_holo.9.png b/app/res/drawable-mdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index df8c8ba6c..000000000
Binary files a/app/res/drawable-mdpi/tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_unselected_focused_holo.9.png b/app/res/drawable-mdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index 08457312a..000000000
Binary files a/app/res/drawable-mdpi/tab_unselected_focused_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_unselected_holo.9.png b/app/res/drawable-mdpi/tab_unselected_holo.9.png
deleted file mode 100644
index 24661d4e4..000000000
Binary files a/app/res/drawable-mdpi/tab_unselected_holo.9.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png b/app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index da116b0f3..000000000
Binary files a/app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/app/res/drawable/tab_indicator_holo.xml b/app/res/drawable/tab_indicator_holo.xml
deleted file mode 100644
index 77f372126..000000000
--- a/app/res/drawable/tab_indicator_holo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
-
-     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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/tab_unselected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/tab_unselected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!--    Non focused states -->
-    <item android:drawable="@drawable/tab_unselected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-</selector>
diff --git a/app/res/layout/detail.xml b/app/res/layout/detail.xml
index 826afc59c..b2e51ac4a 100644
--- a/app/res/layout/detail.xml
+++ b/app/res/layout/detail.xml
@@ -88,140 +88,133 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TabHost
-        android:id="@+id/tabhost"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/buttons"
-        android:layout_below="@id/appbarlayout">
+        android:layout_below="@id/appbarlayout"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/detail_tabs"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content" />
 
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <FrameLayout
-                android:id="@android:id/tabcontent"
+            <LinearLayout
+                android:id="@+id/tab_main"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/activity_margin"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:id="@+id/tab_main"
+                <org.runnerup.widget.TitleSpinner
+                    android:id="@+id/summary_sport"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="@dimen/activity_margin"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1px"
+                    android:prompt="@string/Type"
+                    android:text="@string/Sport" />
 
-                    <org.runnerup.widget.TitleSpinner
-                        android:id="@+id/summary_sport"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="1px"
-                        android:prompt="@string/Type"
-                        android:text="@string/Sport" />
-
-                    <org.runnerup.widget.TitleSpinner
-                        android:id="@+id/summary_manual_distance"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="numberDecimal"
-                        android:minWidth="48dp"
-                        android:minHeight="48dp"
-                        android:prompt="@string/Type"
-                        android:text="@string/Distance"
-                        runnerup:type="distancepicker" />
-
-                    <EditText
-                        android:id="@+id/notes_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="top|start"
-                        android:hint="@string/Notes_about_your_workout"
-                        android:inputType="textCapSentences|textMultiLine"
-                        android:minLines="4"
-                        android:singleLine="false"
-                        tools:ignore="AutoFill" />
-
-                    <LinearLayout
-                        android:id="@+id/hrzonesBarLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@android:color/black"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="@string/Heartrate_zones_distribution"
-                            android:textAlignment="center"
-                            android:textColor="@android:color/white" />
-                    </LinearLayout>
-                </LinearLayout>
+                <org.runnerup.widget.TitleSpinner
+                    android:id="@+id/summary_manual_distance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="numberDecimal"
+                    android:minWidth="48dp"
+                    android:minHeight="48dp"
+                    android:prompt="@string/Type"
+                    android:text="@string/Distance"
+                    runnerup:type="distancepicker" />
+
+                <EditText
+                    android:id="@+id/notes_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top|start"
+                    android:hint="@string/Notes_about_your_workout"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:minLines="4"
+                    android:singleLine="false"
+                    tools:ignore="AutoFill" />
 
                 <LinearLayout
-                    android:id="@+id/tab_lap"
+                    android:id="@+id/hrzonesBarLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_margin="@dimen/activity_margin"
-                    android:baselineAligned="false">
+                    android:background="@android:color/black"
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
-                    <ListView
-                        android:id="@+id/laplist"
-                        android:layout_width="0dip"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_gravity="center"
+                        android:text="@string/Heartrate_zones_distribution"
+                        android:textAlignment="center"
+                        android:textColor="@android:color/white" />
                 </LinearLayout>
+            </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/tab_map"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                    <org.runnerup.util.MapViewWrapper
-                        android:id="@+id/mapview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-                </LinearLayout>
-
-                <ScrollView
-                    android:id="@+id/tab_graph"
+            <LinearLayout
+                android:id="@+id/tab_lap"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/activity_margin"
+                android:baselineAligned="false">
+
+                <ListView
+                    android:id="@+id/laplist"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/tab_map"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <org.runnerup.util.MapViewWrapper
+                    android:id="@+id/mapview"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:scrollbars="none">
+                    android:layout_height="match_parent" />
+            </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/graphview"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/activity_margin"
-                        android:orientation="vertical"
-                        android:weightSum="1" />
-                </ScrollView>
+            <ScrollView
+                android:id="@+id/tab_graph"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:scrollbars="none">
 
                 <LinearLayout
-                    android:id="@+id/tab_upload"
+                    android:id="@+id/graphview"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_margin="@dimen/activity_margin"
-                    android:baselineAligned="false">
+                    android:orientation="vertical"
+                    android:weightSum="1" />
+            </ScrollView>
 
-                    <ListView
-                        android:id="@+id/report_list"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-                </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-    </TabHost>
+            <LinearLayout
+                android:id="@+id/tab_upload"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/activity_margin"
+                android:baselineAligned="false">
+
+                <ListView
+                    android:id="@+id/report_list"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </FrameLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/buttons"
diff --git a/app/res/layout/start.xml b/app/res/layout/start.xml
index c3c7497b6..cfd99ff48 100644
--- a/app/res/layout/start.xml
+++ b/app/res/layout/start.xml
@@ -43,178 +43,171 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-    <TabHost
-        android:id="@+id/tabhost_start"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <RelativeLayout
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/start_tabs"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:minWidth="48dp"
-                android:minHeight="48dp" />
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:minWidth="48dp"
+            android:minHeight="48dp" />
 
-            <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@android:id/tabs">
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/start_tabs">
 
-                <include layout="@layout/start_basic" />
+            <include layout="@layout/start_basic" />
 
-                <include layout="@layout/start_interval" />
+            <include layout="@layout/start_interval" />
 
-                <include layout="@layout/start_advanced" />
-            </FrameLayout>
+            <include layout="@layout/start_advanced" />
+        </FrameLayout>
 
-            <RelativeLayout
-                android:id="@+id/status_layout"
-                android:layout_width="match_parent"
+        <RelativeLayout
+            android:id="@+id/status_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:animateLayoutChanges="true"
+            android:background="#424242"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+            tools:ignore="UnusedAttribute">
+
+            <LinearLayout
+                android:id="@+id/status_frame"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:animateLayoutChanges="true"
-                android:background="#424242"
-                android:clickable="true"
-                android:focusable="true"
                 android:orientation="vertical"
-                tools:ignore="UnusedAttribute">
+                android:padding="16dp">
 
                 <LinearLayout
-                    android:id="@+id/status_frame"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="16dp">
+                    android:gravity="bottom|start"
+                    android:orientation="horizontal">
 
-                    <LinearLayout
+                    <TextView
+                        android:id="@+id/device_status"
+                        style="@style/StatusText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="bottom|start"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/device_status"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/No_devices_connected"
-                            android:visibility="gone" />
-
-                        <ImageView
-                            android:id="@+id/hr_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            android:contentDescription="@string/Heart_Rate_Monitor"
-                            android:visibility="gone"
-                            app:srcCompat="@drawable/ic_heartrate_white_24dp" />
-
-                        <TextView
-                            android:id="@+id/hr_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
-                            android:visibility="gone" />
-
-                        <ImageView
-                            android:id="@+id/wearos_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            android:contentDescription="@string/Wear_OS_Device"
-                            android:visibility="gone"
-                            app:srcCompat="@drawable/ic_watch_white_24dp" />
-
-                        <TextView
-                            android:id="@+id/wearos_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp" />
-
-                        <ImageView
-                            android:id="@+id/gps_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            app:srcCompat="@drawable/ic_gps_1"
-                            tools:ignore="ContentDescription" />
-
-                        <TextView
-                            android:id="@+id/gps_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/gps_detail_row"
+                        android:text="@string/No_devices_connected"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/hr_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        android:contentDescription="@string/Heart_Rate_Monitor"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_heartrate_white_24dp" />
+
+                    <TextView
+                        android:id="@+id/hr_message"
+                        style="@style/StatusText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:gravity="bottom|start"
+                        android:layout_marginEnd="8dp"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/wearos_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        android:contentDescription="@string/Wear_OS_Device"
                         android:visibility="gone"
-                        tools:ignore="UseCompoundDrawables">
-
-                        <ImageView
-                            android:id="@+id/gps_detail_indicator"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginEnd="4dp"
-                            app:srcCompat="@drawable/ic_gps_1"
-                            tools:ignore="ContentDescription" />
+                        app:srcCompat="@drawable/ic_watch_white_24dp" />
 
-                        <TextView
-                            android:id="@+id/gps_detail_message"
-                            style="@style/StatusText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/wearos_message"
+                        style="@style/StatusText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp" />
+
+                    <ImageView
+                        android:id="@+id/gps_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        app:srcCompat="@drawable/ic_gps_1"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/gps_message"
+                        style="@style/StatusText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
 
                 </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/expand_icon"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/status_frame"
-                    android:minWidth="48dp"
-                    android:minHeight="48dp"
-                    app:srcCompat="@drawable/ic_expand_up_white_24dp"
-                    tools:ignore="ContentDescription" />
-
-                <Button
-                    android:id="@+id/gps_enable_button"
-                    style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                <LinearLayout
+                    android:id="@+id/gps_detail_row"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    tools:ignore="RelativeOverlap" />
+                    android:layout_marginTop="8dp"
+                    android:gravity="bottom|start"
+                    android:visibility="gone"
+                    tools:ignore="UseCompoundDrawables">
+
+                    <ImageView
+                        android:id="@+id/gps_detail_indicator"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginEnd="4dp"
+                        app:srcCompat="@drawable/ic_gps_1"
+                        tools:ignore="ContentDescription" />
+
+                    <TextView
+                        android:id="@+id/gps_detail_message"
+                        style="@style/StatusText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                </LinearLayout>
+
+            </LinearLayout>
 
-            </RelativeLayout>
+            <ImageView
+                android:id="@+id/expand_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/status_frame"
+                android:minWidth="48dp"
+                android:minHeight="48dp"
+                app:srcCompat="@drawable/ic_expand_up_white_24dp"
+                tools:ignore="ContentDescription" />
 
-            <include
-                layout="@layout/start_fab"
+            <Button
+                android:id="@+id/gps_enable_button"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginStart="@dimen/activity_margin"
-                android:layout_marginBottom="20dp" />
+                android:layout_centerVertical="true"
+                tools:ignore="RelativeOverlap" />
 
         </RelativeLayout>
-    </TabHost>
+
+        <include
+            layout="@layout/start_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/activity_margin"
+            android:layout_marginBottom="20dp" />
+
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 7478ab464..abdb0ead5 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -27,9 +27,7 @@
         <item name="windowActionBar">false</item>
     </style>
 
-    <style name="MainLayoutTheme" parent="AppTheme.NoActionBar">
-        <item name="android:tabWidgetStyle">@style/BottomNavigationTabWidget</item>
-    </style>
+    <style name="MainLayoutTheme" parent="AppTheme.NoActionBar" />
 
     <style name="ButtonText" parent="Widget.AppCompat.Button.Colored">
         <item name="android:textColor">@color/btn_text_color</item>
@@ -55,14 +53,6 @@
         <item name="android:textSize">20sp</item>
     </style>
 
-    <style name="BottomNavigationTabWidget" parent="android:Widget.TabWidget">
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:tabStripEnabled">false</item>
-        <item name="divider">@null</item>
-        <item name="android:gravity">fill_horizontal|center_vertical</item>
-    </style>
-
     <style name="BottomNavigationTabText" tools:ignore="UnusedResources">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/bottom_tabs</item>
diff --git a/app/src/main/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java b/app/src/main/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java
index d9405b792..c7645fdb4 100644
--- a/app/src/main/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java
+++ b/app/src/main/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java
@@ -47,5 +47,10 @@ public void notify(int notificationId, Notification notification) {
   public void cancel(int notificationId) {
     isForeground = false;
     ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_REMOVE);
+    // Updates after the first are posted with notify(), and the service may already have
+    // left the foreground (RunActivity.doStop), so remove the notification explicitly too.
+    android.app.NotificationManager notificationManager =
+        (android.app.NotificationManager) service.getSystemService(Context.NOTIFICATION_SERVICE);
+    notificationManager.cancel(notificationId);
   }
 }
diff --git a/app/src/main/org/runnerup/view/DetailActivity.java b/app/src/main/org/runnerup/view/DetailActivity.java
index c9364023c..8473ba3e0 100644
--- a/app/src/main/org/runnerup/view/DetailActivity.java
+++ b/app/src/main/org/runnerup/view/DetailActivity.java
@@ -46,11 +46,11 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.TabHost;
-import android.widget.TabHost.TabSpec;
 import android.widget.TextView;
 import androidx.activity.EdgeToEdge;
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -61,6 +61,7 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
+import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -120,7 +121,11 @@ public class DetailActivity extends AppCompatActivity implements Constants {
   private EditText notes = null;
   private View rootView;
   private View mapTab;
-  private View graphTab;
+  private TabLayout detailTabs;
+  private final ArrayList<View> tabContents = new ArrayList<>();
+  private final ActivityResultLauncher<Intent> accountListLauncher =
+      registerForActivityResult(
+          new ActivityResultContracts.StartActivityForResult(), result -> requery());
 
   private MapWrapper mapWrapper = null;
   private final GraphWrapper graphWrapper = null;
@@ -131,6 +136,7 @@ public class DetailActivity extends AppCompatActivity implements Constants {
   private long mStartTime = 0; // activity start time in unix timestamp
   private ContentValues headerData = new ContentValues();
   private static final int EDIT_ACCOUNT_REQUEST = 2;
+  private static final String STATE_SELECTED_TAB_POSITION = "selectedTab";
 
   /** Called when the activity is first created. */
   @Override
@@ -227,43 +233,38 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
 
     uploadButton.setVisibility(View.GONE);
 
-    TabHost th = findViewById(R.id.tabhost);
-    th.setup();
-    TabSpec tabSpec = th.newTabSpec("notes");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Notes)));
-    tabSpec.setContent(R.id.tab_main);
-    th.addTab(tabSpec);
-
-    tabSpec = th.newTabSpec("laps");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Laps)));
-    tabSpec.setContent(R.id.tab_lap);
-    th.addTab(tabSpec);
+    detailTabs = findViewById(R.id.detail_tabs);
+    addDetailTab(org.runnerup.common.R.string.Notes, R.id.tab_main);
+    addDetailTab(org.runnerup.common.R.string.Laps, R.id.tab_lap);
 
     if (BuildConfig.OSMDROID_ENABLED || BuildConfig.MAPBOX_ENABLED) {
-      tabSpec = th.newTabSpec("map");
-      tabSpec.setIndicator(
-          WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Map)));
-      tabSpec.setContent(R.id.tab_map);
-      th.addTab(tabSpec);
-      mapTab = th.getTabWidget().getChildTabViewAt(2);
+      addDetailTab(org.runnerup.common.R.string.Map, R.id.tab_map);
+      mapTab = detailTabs.getTabAt(2).view;
     }
 
-    tabSpec = th.newTabSpec("graph");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Graph)));
-    tabSpec.setContent(R.id.tab_graph);
-    th.addTab(tabSpec);
-    // Get graph tab (cannot hardcode index due to optional map tab).
-    int graphTabIndex = th.getTabWidget().getChildCount() - 1;
-    graphTab = th.getTabWidget().getChildTabViewAt(graphTabIndex);
-
-    tabSpec = th.newTabSpec("share");
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(this, getString(org.runnerup.common.R.string.Upload)));
-    tabSpec.setContent(R.id.tab_upload);
-    th.addTab(tabSpec);
+    addDetailTab(org.runnerup.common.R.string.Graph, R.id.tab_graph);
+    addDetailTab(org.runnerup.common.R.string.Upload, R.id.tab_upload);
+    detailTabs.addOnTabSelectedListener(
+        new TabLayout.OnTabSelectedListener() {
+          @Override
+          public void onTabSelected(@NonNull TabLayout.Tab tab) {
+            showDetailTab(tab.getPosition());
+          }
+
+          @Override
+          public void onTabUnselected(@NonNull TabLayout.Tab tab) {}
+
+          @Override
+          public void onTabReselected(@NonNull TabLayout.Tab tab) {}
+        });
+    showDetailTab(0);
+    if (savedInstanceState != null) {
+      TabLayout.Tab tab =
+          detailTabs.getTabAt(savedInstanceState.getInt(STATE_SELECTED_TAB_POSITION, 0));
+      if (tab != null) {
+        detailTabs.selectTab(tab);
+      }
+    }
 
     fillHeaderData();
     requery();
@@ -370,6 +371,9 @@ private void updateViewForSport(int sportValue) {
 
     if (mapTab != null) {
       if (Sport.isWithoutGps(sportValue)) {
+        if (detailTabs.getSelectedTabPosition() == 2) {
+          detailTabs.selectTab(detailTabs.getTabAt(0));
+        }
         mapTab.setVisibility(View.GONE);
       } else {
         mapTab.setVisibility(View.VISIBLE);
@@ -381,6 +385,17 @@ private void updateViewForSport(int sportValue) {
     }
   }
 
+  private void addDetailTab(int titleId, int contentId) {
+    detailTabs.addTab(detailTabs.newTab().setText(titleId));
+    tabContents.add(findViewById(contentId));
+  }
+
+  private void showDetailTab(int selectedPosition) {
+    for (int i = 0; i < tabContents.size(); i++) {
+      tabContents.get(i).setVisibility(i == selectedPosition ? View.VISIBLE : View.GONE);
+    }
+  }
+
   private void setUploadVisibility() {
     boolean enabled = !pendingSynchronizers.isEmpty();
     if (enabled) {
@@ -485,6 +500,7 @@ public void onPause() {
   @Override
   public void onSaveInstanceState(@NonNull Bundle outState) {
     super.onSaveInstanceState(outState);
+    outState.putInt(STATE_SELECTED_TAB_POSITION, detailTabs.getSelectedTabPosition());
     if (mapWrapper != null) {
       mapWrapper.onSaveInstanceState(outState);
     }
@@ -817,7 +833,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         b.setOnClickListener(
             v -> {
               Intent i = new Intent(DetailActivity.this, AccountListActivity.class);
-              DetailActivity.this.startActivityForResult(i, EDIT_ACCOUNT_REQUEST);
+              accountListLauncher.launch(i);
             });
         return b;
       }
@@ -1036,6 +1052,7 @@ public void onCheckedChanged(CompoundButton arg0, boolean arg1) {
                   (dialog, which) -> dialog.dismiss())
               .show();
 
+  @SuppressWarnings("deprecation")
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/org/runnerup/view/StartFragment.java b/app/src/main/org/runnerup/view/StartFragment.java
index 1a442b4b1..044c83e54 100644
--- a/app/src/main/org/runnerup/view/StartFragment.java
+++ b/app/src/main/org/runnerup/view/StartFragment.java
@@ -50,10 +50,9 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.TabHost;
-import android.widget.TabHost.OnTabChangeListener;
-import android.widget.TabHost.TabSpec;
 import android.widget.TextView;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -62,6 +61,7 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
+import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -91,7 +91,6 @@
 import org.runnerup.widget.SpinnerInterface.OnCloseDialogListener;
 import org.runnerup.widget.SpinnerInterface.OnSetValueListener;
 import org.runnerup.widget.TitleSpinner;
-import org.runnerup.widget.WidgetUtil;
 import org.runnerup.workout.Dimension;
 import org.runnerup.workout.Sport;
 import org.runnerup.workout.Workout;
@@ -111,6 +110,7 @@ private enum GpsLevel {
   private static final String TAB_BASIC = "basic";
   private static final String TAB_INTERVAL = "interval";
   static final String TAB_ADVANCED = "advanced";
+  private static final String STATE_SELECTED_TAB_POSITION = "selectedTab";
 
   private boolean statusDetailsShown = false;
 
@@ -122,7 +122,14 @@ private enum GpsLevel {
   private Tracker mTracker = null;
   private org.runnerup.tracker.GpsStatus mGpsStatus = null;
 
-  private TabHost tabHost = null;
+  private TabLayout tabLayout = null;
+  private final ActivityResultLauncher<Intent> runActivityLauncher =
+      registerForActivityResult(
+          new ActivityResultContracts.StartActivityForResult(),
+          result -> handleActivityResult(START_ACTIVITY, result.getResultCode(), result.getData()));
+  private View basicTabView;
+  private View intervalTabView;
+  private View advancedTabView;
   private View startButton = null;
 
   private ImageView expandIcon = null;
@@ -251,31 +258,34 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     view.findViewById(R.id.status_layout).setOnClickListener(v -> toggleStatusDetails());
 
-    // TODO: Replace TabHost with ViewPager2 and TabLayout
-    tabHost = view.findViewById(R.id.tabhost_start);
-    tabHost.setup();
-    TabSpec tabSpec = tabHost.newTabSpec(TAB_BASIC);
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(context, getString(org.runnerup.common.R.string.Basic)));
-    tabSpec.setContent(R.id.start_basic_tab);
-    tabHost.addTab(tabSpec);
-
-    tabSpec = tabHost.newTabSpec(TAB_INTERVAL);
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(
-            context, getString(org.runnerup.common.R.string.Interval)));
-    tabSpec.setContent(R.id.start_interval_tab);
-    tabHost.addTab(tabSpec);
-
-    tabSpec = tabHost.newTabSpec(TAB_ADVANCED);
-    tabSpec.setIndicator(
-        WidgetUtil.createHoloTabIndicator(
-            context, getString(org.runnerup.common.R.string.Advanced)));
-    tabSpec.setContent(R.id.start_advanced_tab);
-    tabHost.addTab(tabSpec);
-
-    tabHost.setOnTabChangedListener(onTabChangeListener);
-    // tabHost.getTabWidget().setBackgroundColor(Color.DKGRAY);
+    tabLayout = view.findViewById(R.id.start_tabs);
+    basicTabView = view.findViewById(R.id.start_basic_tab);
+    intervalTabView = view.findViewById(R.id.start_interval_tab);
+    advancedTabView = view.findViewById(R.id.start_advanced_tab);
+    setWorkoutTabVisibility(0);
+    tabLayout.addTab(
+        tabLayout.newTab().setText(org.runnerup.common.R.string.Basic).setTag(TAB_BASIC));
+    tabLayout.addTab(
+        tabLayout.newTab().setText(org.runnerup.common.R.string.Interval).setTag(TAB_INTERVAL));
+    tabLayout.addTab(
+        tabLayout.newTab().setText(org.runnerup.common.R.string.Advanced).setTag(TAB_ADVANCED));
+    tabLayout.addOnTabSelectedListener(
+        new TabLayout.OnTabSelectedListener() {
+          @Override
+          public void onTabSelected(@NonNull TabLayout.Tab tab) {
+            setWorkoutTabVisibility(tab.getPosition());
+            if (TAB_ADVANCED.equals(tab.getTag())) {
+              loadAdvanced(null);
+            }
+            updateView();
+          }
+
+          @Override
+          public void onTabUnselected(@NonNull TabLayout.Tab tab) {}
+
+          @Override
+          public void onTabReselected(@NonNull TabLayout.Tab tab) {}
+        });
 
     LayoutInflater inflater = getLayoutInflater();
     simpleAudioListAdapter = new AudioSchemeListAdapter(mDB, inflater, false);
@@ -324,11 +334,19 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     advancedStepList.setDividerHeight(0);
     advancedStepList.setAdapter(advancedWorkoutStepsAdapter);
 
+    if (savedInstanceState != null) {
+      TabLayout.Tab tab =
+          tabLayout.getTabAt(savedInstanceState.getInt(STATE_SELECTED_TAB_POSITION, 0));
+      if (tab != null) {
+        tabLayout.selectTab(tab);
+      }
+    }
+
     Intent i = requireActivity().getIntent();
     if (i != null) {
       if (i.hasExtra("mode")) {
         if (Objects.equals(i.getStringExtra("mode"), TAB_ADVANCED)) {
-          tabHost.setCurrentTab(2);
+          tabLayout.selectTab(tabLayout.getTabAt(2));
           i.removeExtra("mode");
         }
       }
@@ -463,7 +481,7 @@ public void onResume() {
       simpleTargetType.clearDisabled();
     }
 
-    if (Objects.requireNonNull(tabHost.getCurrentTabTag()).contentEquals(TAB_ADVANCED)) {
+    if (getSelectedTabTag().contentEquals(TAB_ADVANCED)) {
       loadAdvanced(null);
     }
 
@@ -498,6 +516,14 @@ public void onPause() {
     mWearNotifier.onPause();
   }
 
+  @Override
+  public void onSaveInstanceState(@NonNull Bundle outState) {
+    super.onSaveInstanceState(outState);
+    if (tabLayout != null) {
+      outState.putInt(STATE_SELECTED_TAB_POSITION, tabLayout.getSelectedTabPosition());
+    }
+  }
+
   @Override
   public void onStop() {
     super.onStop();
@@ -685,13 +711,16 @@ private void notificationBatteryLevel(int batteryLevel) {
         .show();
   }
 
-  private final OnTabChangeListener onTabChangeListener =
-      tabId -> {
-        if (tabId.contentEquals(TAB_ADVANCED)) {
-          loadAdvanced(null);
-        }
-        updateView();
-      };
+  private String getSelectedTabTag() {
+    TabLayout.Tab selectedTab = tabLayout.getTabAt(tabLayout.getSelectedTabPosition());
+    return selectedTab == null ? TAB_BASIC : (String) selectedTab.getTag();
+  }
+
+  private void setWorkoutTabVisibility(int selectedPosition) {
+    basicTabView.setVisibility(selectedPosition == 0 ? View.VISIBLE : View.GONE);
+    intervalTabView.setVisibility(selectedPosition == 1 ? View.VISIBLE : View.GONE);
+    advancedTabView.setVisibility(selectedPosition == 2 ? View.VISIBLE : View.GONE);
+  }
 
   private Workout prepareWorkout() {
     Context ctx = requireActivity().getApplicationContext();
@@ -699,16 +728,16 @@ private Workout prepareWorkout() {
     SharedPreferences audioPref;
     Workout w;
 
-    if (Objects.requireNonNull(tabHost.getCurrentTabTag()).contentEquals(TAB_BASIC)) {
+    if (getSelectedTabTag().contentEquals(TAB_BASIC)) {
       audioPref =
           WorkoutBuilder.getAudioCuePreferences(ctx, pref, getString(R.string.pref_basic_audio));
       Dimension target = Dimension.valueOf(simpleTargetType.getValueInt());
       w = WorkoutBuilder.createDefaultWorkout(getResources(), pref, target);
-    } else if (tabHost.getCurrentTabTag().contentEquals(TAB_INTERVAL)) {
+    } else if (getSelectedTabTag().contentEquals(TAB_INTERVAL)) {
       audioPref =
           WorkoutBuilder.getAudioCuePreferences(ctx, pref, getString(R.string.pref_interval_audio));
       w = WorkoutBuilder.createDefaultIntervalWorkout(getResources(), pref);
-    } else if (tabHost.getCurrentTabTag().contentEquals(TAB_ADVANCED)) {
+    } else if (getSelectedTabTag().contentEquals(TAB_ADVANCED)) {
       audioPref =
           WorkoutBuilder.getAudioCuePreferences(ctx, pref, getString(R.string.pref_advanced_audio));
       w = advancedWorkout;
@@ -735,8 +764,7 @@ private void startWorkout() {
 
     runActivityPending = true;
     Intent intent = new Intent(requireContext(), RunActivity.class);
-    // TODO: Use the Activity Result API
-    StartFragment.this.startActivityForResult(intent, START_ACTIVITY);
+    runActivityLauncher.launch(intent);
     notificationStateManager.cancelNotification(); // will be added by RunActivity
   }
 
@@ -1005,8 +1033,7 @@ private void updateStartButtonView() {
         break;
       }
 
-      if (Objects.requireNonNull(tabHost.getCurrentTabTag()).contentEquals(TAB_ADVANCED)
-          && advancedWorkout == null) {
+      if (getSelectedTabTag().contentEquals(TAB_ADVANCED) && advancedWorkout == null) {
         break;
       }
 
@@ -1304,10 +1331,7 @@ private void unbindGpsTracker() {
     mTracker = null;
   }
 
-  // TODO: Use Activity Result API
-  @Override
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
+  private void handleActivityResult(int requestCode, int resultCode, Intent data) {
     registerStartEventListener();
 
     if (data != null) {
diff --git a/app/src/main/org/runnerup/widget/WidgetUtil.java b/app/src/main/org/runnerup/widget/WidgetUtil.java
index fab23b33a..96675cf65 100644
--- a/app/src/main/org/runnerup/widget/WidgetUtil.java
+++ b/app/src/main/org/runnerup/widget/WidgetUtil.java
@@ -17,16 +17,9 @@
 
 package org.runnerup.widget;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.TextView;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.view.ViewCompat;
-import org.runnerup.R;
 
 public class WidgetUtil {
 
@@ -39,21 +32,6 @@ public static void setEditable(EditText editText, boolean onoff) {
     }
   }
 
-  public static View createHoloTabIndicator(Context ctx, String title) {
-    TextView txtTab = new TextView(ctx);
-    txtTab.setText(title);
-    // txtTab.setTextColor(Color.WHITE);
-    // txtTab.setGravity(Gravity.CENTER_HORIZONTAL);
-    Drawable drawable = AppCompatResources.getDrawable(ctx, R.drawable.tab_indicator_holo);
-    ViewCompat.setBackground(txtTab, drawable);
-
-    int h = (25 * drawable.getIntrinsicHeight()) / 10;
-    txtTab.setPadding(0, h, 0, h);
-    // txtTab.setHeight(1 + 10 * drawable.getIntrinsicHeight());
-    // txtTab.setLineSpacing(1 + 5 * drawable.getIntrinsicHeight(), 1);
-    return txtTab;
-  }
-
   public static void addLegacyOverflowButton(Window window) {
     if (window.peekDecorView() == null) {
       return;