diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml
index a1ec36c6c0..4f02a7d75f 100644
--- a/OsmAnd/AndroidManifest-free.xml
+++ b/OsmAnd/AndroidManifest-free.xml
@@ -10,11 +10,6 @@
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:resource="@string/facebook_app_id"/>
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name_free"/>
-
         <activity
             android:name="net.osmand.plus.activities.MapActivity"
             android:theme="@style/FirstSplashScreenFree"
diff --git a/OsmAnd/AndroidManifest-freecustom.xml b/OsmAnd/AndroidManifest-freecustom.xml
new file mode 100644
index 0000000000..86f38b2374
--- /dev/null
+++ b/OsmAnd/AndroidManifest-freecustom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:icon="@mipmap/icon_free"
+        tools:replace="android:icon">
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:resource="@string/facebook_app_id"/>
+        <activity
+            android:name="net.osmand.plus.activities.MapActivity"
+            android:theme="@style/FirstSplashScreenCustom"
+            tools:replace="android:theme"/>
+        <service
+            android:name="net.osmand.plus.NavigationService"
+            android:process="net.osmand.freecustom"
+            tools:replace="android:process"/>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="net.osmand.freecustom.fileprovider"
+            tools:replace="android:authorities"/>
+    </application>
+</manifest> 
diff --git a/OsmAnd/AndroidManifest-freedev.xml b/OsmAnd/AndroidManifest-freedev.xml
index 47a4dbbeb6..f3878f22e8 100644
--- a/OsmAnd/AndroidManifest-freedev.xml
+++ b/OsmAnd/AndroidManifest-freedev.xml
@@ -5,6 +5,9 @@
     <application
         android:icon="@mipmap/icon_nightly"
         tools:replace="android:icon">
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:resource="@string/facebook_app_id"/>
         <activity
             android:name="net.osmand.plus.activities.MapActivity"
             android:theme="@style/FirstSplashScreenFreeDev"
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index db5d639a78..2667eb7c5f 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -95,6 +95,9 @@ android {
 		freedev {
 			manifest.srcFile "AndroidManifest-freedev.xml"
 		}
+		freecustom {
+			manifest.srcFile "AndroidManifest-freecustom.xml"
+		}
 
 		legacy {
 			jniLibs.srcDirs = ["libgnustl"]
@@ -147,6 +150,10 @@ android {
 			applicationId "net.osmand"
 			resConfig "en"
 		}
+		freecustom {
+			dimension "version"
+			applicationId "net.osmand.freecustom"
+		}
 		full {
 			dimension "version"
 			applicationId "net.osmand.plus"
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index a4be224c3d..c1f61c518c 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -73,6 +73,10 @@
         <item name="android:textColor">?attr/contextMenuButtonColor</item>
         <item name="android:background">?attr/selectableItemBackground</item>
     </style>
+    
+    <style name="FirstSplashScreenCustom" parent="OsmandLightTheme.NoActionbar">
+        <item name="android:windowBackground">@drawable/first_splash_screen_free</item>
+    </style>
 
     <style name="FirstSplashScreenPlus" parent="OsmandLightTheme.NoActionbar">
         <item name="android:windowBackground">@drawable/first_splash_screen_plus</item>
diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index bfc4fbfd31..42e0fe0cb6 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -12,7 +12,7 @@ public class Version {
 	private final String appName;
 	private final static String FREE_VERSION_NAME = "net.osmand";
 	private final static String FREE_DEV_VERSION_NAME = "net.osmand.dev";
-	private final static String SHERPAFY_VERSION_NAME = "net.osmand.sherpafy";
+	private final static String FREE_CUSTOM_VERSION_NAME = "net.osmand.freecustom";
 	private final static String UTM_REF = "&referrer=utm_source%3Dosmand";
 	
 	public static boolean isGpsStatusEnabled(OsmandApplication ctx) {
@@ -57,9 +57,6 @@ public class Version {
 		return ctx.getString(R.string.versionFeatures).contains("+play_market");
 	}
 	
-	public static boolean isSherpafy(OsmandApplication ctx) {
-		return ctx.getPackageName().equals(SHERPAFY_VERSION_NAME);
-	}
 	
 	private Version(OsmandApplication ctx) {
 		String appVersion = "";
@@ -116,7 +113,10 @@ public class Version {
 	}
 	
 	public static boolean isFreeVersion(OsmandApplication ctx){
-		return ctx.getPackageName().equals(FREE_VERSION_NAME) || ctx.getPackageName().equals(FREE_DEV_VERSION_NAME);
+		return ctx.getPackageName().equals(FREE_VERSION_NAME) || 
+				ctx.getPackageName().equals(FREE_DEV_VERSION_NAME) ||
+				ctx.getPackageName().equals(FREE_CUSTOM_VERSION_NAME)
+				;
 	}
 
 	public static boolean isPaidVersion(OsmandApplication ctx) {