diff --git a/AndorsTrail/app/build.gradle b/AndorsTrail/app/build.gradle
index 0c2bfc772..5d9b1b1fe 100644
--- a/AndorsTrail/app/build.gradle
+++ b/AndorsTrail/app/build.gradle
@@ -12,9 +12,14 @@ android {
 
     buildTypes {
         release {
+            manifestPlaceholders icon_name: 'icon', fileproviderPath: 'AndorsTrail'
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
+        debug {
+            manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
+            applicationIdSuffix 'beta2'
+        }
     }
 }
 
diff --git a/AndorsTrail/app/src/main/AndroidManifest.xml b/AndorsTrail/app/src/main/AndroidManifest.xml
index d1bcae863..75a80570d 100644
--- a/AndorsTrail/app/src/main/AndroidManifest.xml
+++ b/AndorsTrail/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
 	<application 
 		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/icon"
+		android:icon="@drawable/${icon_name}"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -67,7 +67,7 @@
 
         <provider
         android:name="android.support.v4.content.FileProvider"
-        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
+        android:authorities="${applicationId}.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data
diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java
index 409023c60..010ae2051 100644
--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java
@@ -99,7 +99,9 @@ public final class AndroidStorage {
 
     public static String getUrlForFile(Context context, File worldmap) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);
+            String applicationId = context.getPackageName();
+//            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);
+            Uri uri = FileProvider.getUriForFile(context, applicationId + ".fileprovider", worldmap);
             return uri.toString();
         } else {
             return "file://" + worldmap.getAbsolutePath();