diff --git a/build.gradle b/build.gradle
index ee59d9229..7d7bf1295 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 
@@ -54,6 +54,11 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
+        manifestPlaceholders = [
+                applicationLogo: "@drawable/ic_logo_color_24dp",
+                applicationName: "@strings/app_name"
+        ]
+
         //Useful for debugging.
         //versionCode getVersionCode()
 
@@ -69,6 +74,10 @@ android {
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
+            manifestPlaceholders = [
+                    applicationLogo: "@android:drawable/ic_menu_mylocation",
+                    applicationName: "OpenTracks (Debug)"
+            ]
         }
 
         release {
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 154037b3f..cc1eebfd1 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -23,8 +23,8 @@ limitations under the License.
         android:name=".Startup"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_logo_color_24dp"
-        android:label="@string/app_name"
+        android:icon="${applicationLogo}"
+        android:label="${applicationName}"
         android:theme="@style/ThemeCustom">
 
         <!-- Activities -->