diff --git a/build.gradle b/build.gradle
index 962f055d5..5548da256 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 
@@ -35,10 +35,14 @@ def getVersionName = { ->
     try {
         def stdout = new ByteArrayOutputStream()
         exec {
-            commandLine 'git', 'describe', '--tags', '--dirty'
+            commandLine 'git', 'describe', '--tags'
             standardOutput = stdout
         }
-        return stdout.toString().trim()
+        exec {
+            commandLine 'git', 'log', '--format="%h"', '-n 1'
+            standardOutput = stdout
+        }
+        return stdout.toString().replace('\n', '-').replace('"', '').trim()
     }
     catch (ignored) {
         return null
@@ -75,10 +79,6 @@ android {
     applicationVariants.all { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
     }
-
-    lintOptions {
-        disable "AppCompatResource" // TODO Disable complaint to use androidx's SearchView as it is null.
-    }
 }
 
 dependencies {
diff --git a/src/main/res/menu/track_detail.xml b/src/main/res/menu/track_detail.xml
index 5b76794d4..5282be8b5 100644
--- a/src/main/res/menu/track_detail.xml
+++ b/src/main/res/menu/track_detail.xml
@@ -42,7 +42,7 @@ limitations under the License.
         android:id="@+id/track_detail_markers"
         android:icon="@drawable/ic_marker_show_24dp"
         android:orderInCategory="5"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_detail_edit"