diff --git a/myTracks/build.gradle b/myTracks/build.gradle
index b6a81b28e..94617ec6e 100644
--- a/myTracks/build.gradle
+++ b/myTracks/build.gradle
@@ -23,6 +23,6 @@ dependencies {
     implementation project(':myTracksLib')
 
     implementation 'com.google.android.gms:play-services-location:17.0.0'
-    //implementation 'com.google.android.gms:play-services:12.0.1'
-    //implementation 'com.google.android.gms:play-services-auth:17.0.0'
+
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 }
diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java
index f01e387bd..1d6339d34 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java
@@ -28,6 +28,7 @@ import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -129,6 +130,7 @@ public abstract class AbstractTrackActivity extends AbstractActivity implements
 
         if (searchView == null) {
             //TODO This is a workaround and needs to be fixed; looks like a configuration issue.
+            Log.d(AbstractTrackActivity.class.getCanonicalName(), "Search is not yet implemented.");
             return;
         }
 
diff --git a/myTracks/src/main/res/menu/list_context_menu.xml b/myTracks/src/main/res/menu/list_context_menu.xml
index 5ec793768..59b5a6a97 100644
--- a/myTracks/src/main/res/menu/list_context_menu.xml
+++ b/myTracks/src/main/res/menu/list_context_menu.xml
@@ -13,30 +13,38 @@ 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">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:icon="@drawable/ic_menu_share"
         android:id="@+id/list_context_menu_share"
+        android:icon="@drawable/ic_menu_share"
         android:title="@string/menu_share"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/track_detail_share"
+        android:icon="@drawable/ic_menu_share"
+        android:orderInCategory="4"
+        android:title="@string/menu_share"
+        app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider"
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_show_on_map"
         android:id="@+id/list_context_menu_show_on_map"
+        android:icon="@drawable/ic_menu_show_on_map"
         android:title="@string/menu_show_on_map"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_edit"
         android:id="@+id/list_context_menu_edit"
+        android:icon="@drawable/ic_menu_edit"
         android:title="@string/menu_edit"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_delete"
         android:id="@+id/list_context_menu_delete"
+        android:icon="@drawable/ic_menu_delete"
         android:title="@string/menu_delete"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_select_all"
         android:id="@+id/list_context_menu_select_all"
+        android:icon="@drawable/ic_menu_select_all"
         android:title="@string/menu_select_all"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/marker_detail.xml b/myTracks/src/main/res/menu/marker_detail.xml
index 98b58ebc7..056ed7b82 100644
--- a/myTracks/src/main/res/menu/marker_detail.xml
+++ b/myTracks/src/main/res/menu/marker_detail.xml
@@ -13,25 +13,26 @@ 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">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/marker_detail_show_on_map"
         android:icon="@drawable/ic_menu_show_on_map"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_show_on_map" />
+        android:title="@string/menu_show_on_map"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/marker_detail_edit"
         android:icon="@drawable/ic_menu_edit"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_edit" />
+        android:title="@string/menu_edit"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/marker_detail_delete"
         android:icon="@drawable/ic_menu_delete"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_delete" />
+        android:title="@string/menu_delete"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/marker_detail_view_photo"
         android:icon="@drawable/ic_menu_view_photo"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_view_photo" />
+        android:title="@string/menu_view_photo"
+        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/marker_list.xml b/myTracks/src/main/res/menu/marker_list.xml
index 4d87bddcd..79487d142 100644
--- a/myTracks/src/main/res/menu/marker_list.xml
+++ b/myTracks/src/main/res/menu/marker_list.xml
@@ -13,16 +13,17 @@ 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">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:icon="@drawable/ic_menu_insert_marker"
         android:id="@+id/marker_list_insert_marker"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_insert_marker" />
+        android:icon="@drawable/ic_menu_insert_marker"
+        android:title="@string/menu_insert_marker"
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_search"
         android:id="@+id/marker_list_search"
+        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
-        android:showAsAction="ifRoom|collapseActionView"
-        android:actionViewClass="androidx.appcompat.widget.SearchView" />
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="ifRoom|collapseActionView" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/search_list.xml b/myTracks/src/main/res/menu/search_list.xml
index bd67cbd31..eb067a82d 100644
--- a/myTracks/src/main/res/menu/search_list.xml
+++ b/myTracks/src/main/res/menu/search_list.xml
@@ -13,11 +13,12 @@ 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">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:icon="@drawable/ic_menu_search"
         android:id="@+id/search_list_search"
+        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
-        android:showAsAction="ifRoom|collapseActionView"
-        android:actionViewClass="androidx.appcompat.widget.SearchView" />
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="ifRoom|collapseActionView" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/track_detail.xml b/myTracks/src/main/res/menu/track_detail.xml
index 621510172..e4a8bd230 100644
--- a/myTracks/src/main/res/menu/track_detail.xml
+++ b/myTracks/src/main/res/menu/track_detail.xml
@@ -13,58 +13,60 @@ 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">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:icon="@drawable/ic_menu_insert_marker"
         android:id="@+id/track_detail_insert_marker"
+        android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="1"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_insert_marker" />
+        android:title="@string/menu_insert_marker"
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_insert_photo"
         android:id="@+id/track_detail_insert_photo"
+        android:icon="@drawable/ic_menu_insert_photo"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_insert_photo" />
+        android:title="@string/menu_insert_photo"
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_share"
         android:id="@+id/track_detail_share"
+        android:icon="@drawable/ic_menu_share"
         android:orderInCategory="4"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_share" />
+        android:title="@string/menu_share"
+        app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider"
+        app:showAsAction="never" />
     <item
-        android:icon="@drawable/ic_menu_markers"
         android:id="@+id/track_detail_markers"
+        android:icon="@drawable/ic_menu_markers"
         android:orderInCategory="5"
         android:title="@string/menu_markers" />
     <item
-        android:icon="@drawable/ic_menu_edit"
         android:id="@+id/track_detail_edit"
+        android:icon="@drawable/ic_menu_edit"
         android:orderInCategory="9"
         android:title="@string/menu_edit" />
     <item
-        android:icon="@drawable/ic_menu_delete"
         android:id="@+id/track_detail_delete"
+        android:icon="@drawable/ic_menu_delete"
         android:orderInCategory="10"
         android:title="@string/menu_delete" />
     <item
-        android:icon="@drawable/ic_menu_voice_frequency"
         android:id="@+id/track_detail_voice_frequency"
+        android:icon="@drawable/ic_menu_voice_frequency"
         android:orderInCategory="11"
         android:title="@string/menu_voice_frequency" />
     <item
-        android:icon="@drawable/ic_menu_split_frequency"
         android:id="@+id/track_detail_split_frequency"
+        android:icon="@drawable/ic_menu_split_frequency"
         android:orderInCategory="12"
         android:title="@string/menu_split_frequency" />
     <item
-        android:icon="@drawable/ic_menu_sensor_state"
         android:id="@+id/track_detail_sensor_state"
+        android:icon="@drawable/ic_menu_sensor_state"
         android:orderInCategory="13"
         android:title="@string/menu_sensor_state" />
     <item
-        android:icon="@drawable/ic_menu_settings"
         android:id="@+id/track_detail_settings"
+        android:icon="@drawable/ic_menu_settings"
         android:orderInCategory="14"
         android:title="@string/menu_settings" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/track_list.xml b/myTracks/src/main/res/menu/track_list.xml
index 0277f12e5..87e65a7c6 100644
--- a/myTracks/src/main/res/menu/track_list.xml
+++ b/myTracks/src/main/res/menu/track_list.xml
@@ -13,37 +13,37 @@ 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:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:icon="@drawable/ic_menu_search"
         android:id="@+id/track_list_search"
+        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
-        android:actionViewClass="androidx.appcompat.widget.SearchView"
-        android:showAsAction="always" />
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always" />
     <item
-        android:icon="@drawable/ic_menu_start_gps"
         android:id="@+id/track_list_start_gps"
+        android:icon="@drawable/ic_menu_start_gps"
         android:title="@string/menu_start_gps"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
     <item
-        android:icon="@drawable/ic_menu_aggregated_statistics"
         android:id="@+id/track_list_aggregated_statistics"
+        android:icon="@drawable/ic_menu_aggregated_statistics"
         android:title="@string/menu_aggregated_statistics" />
     <item
-        android:icon="@drawable/ic_menu_export"
         android:id="@+id/track_list_export_all"
+        android:icon="@drawable/ic_menu_export"
         android:title="@string/menu_export_all" />
     <item
-        android:icon="@drawable/ic_menu_import"
         android:id="@+id/track_list_import_all"
+        android:icon="@drawable/ic_menu_import"
         android:title="@string/menu_import_all" />
     <item
-        android:icon="@drawable/ic_menu_delete"
         android:id="@+id/track_list_delete_all"
+        android:icon="@drawable/ic_menu_delete"
         android:title="@string/menu_delete_all" />
     <item
-        android:icon="@drawable/ic_menu_settings"
         android:id="@+id/track_list_settings"
+        android:icon="@drawable/ic_menu_settings"
         android:title="@string/menu_settings" />
 </menu>
\ No newline at end of file