diff --git a/android/res/xml-v21/prefs_map.xml b/android/res/xml-v21/prefs_map.xml
index 09a437bcad..2169ab7e4e 100644
--- a/android/res/xml-v21/prefs_map.xml
+++ b/android/res/xml-v21/prefs_map.xml
@@ -31,9 +31,23 @@
     android:entryValues="@array/map_style_values"
     android:order="4"/>
 
+  <SwitchPreference
+    android:key="@string/pref_3d"
+    android:title="3D mode"
+    android:switchTextOn=""
+    android:switchTextOff=""
+    android:order="5"/>
+
+  <SwitchPreference
+    android:key="@string/pref_3d_buildings"
+    android:title="3D buildings"
+    android:switchTextOn=""
+    android:switchTextOff=""
+    android:order="6"/>
+
   <Preference
     android:key="@string/pref_yota"
     android:title="@string/yopme_pref_title"
     android:summary="@string/yopme_pref_summary"
-    android:order="5"/>
+    android:order="7"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml-v21/prefs_route.xml b/android/res/xml-v21/prefs_route.xml
index a7512432f4..10ec5db366 100644
--- a/android/res/xml-v21/prefs_route.xml
+++ b/android/res/xml-v21/prefs_route.xml
@@ -11,16 +11,4 @@
   <ListPreference
     android:key="@string/pref_tts_language"
     android:title="@string/pref_tts_language_title"/>
-
-  <SwitchPreference
-    android:key="@string/pref_3d"
-    android:title="3D mode"
-    android:switchTextOn=""
-    android:switchTextOff=""/>
-
-  <SwitchPreference
-    android:key="@string/pref_3d_buildings"
-    android:title="3D buildings"
-    android:switchTextOn=""
-    android:switchTextOff=""/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml/prefs_map.xml b/android/res/xml/prefs_map.xml
index 2bce401e1f..2d4a162dfc 100644
--- a/android/res/xml/prefs_map.xml
+++ b/android/res/xml/prefs_map.xml
@@ -29,9 +29,19 @@
     android:entryValues="@array/map_style_values"
     android:order="4"/>
 
+  <CheckBoxPreference
+    android:key="@string/pref_3d"
+    android:title="3D mode"
+    android:order="5"/>
+
+  <CheckBoxPreference
+    android:key="@string/pref_3d_buildings"
+    android:title="3D buildings"
+    android:order="6"/>
+
   <Preference
     android:key="@string/pref_yota"
     android:title="@string/yopme_pref_title"
     android:summary="@string/yopme_pref_summary"
-    android:order="5"/>
+    android:order="7"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml/prefs_route.xml b/android/res/xml/prefs_route.xml
index 76399eb2a8..a604318998 100644
--- a/android/res/xml/prefs_route.xml
+++ b/android/res/xml/prefs_route.xml
@@ -9,12 +9,4 @@
   <ListPreference
     android:key="@string/pref_tts_language"
     android:title="@string/pref_tts_language_title"/>
-
-  <CheckBoxPreference
-    android:key="@string/pref_3d"
-    android:title="3D mode"/>
-
-  <CheckBoxPreference
-    android:key="@string/pref_3d_buildings"
-    android:title="3D buildings"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
index 342e79649c..a3d05100da 100644
--- a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
@@ -8,6 +8,8 @@ import android.preference.Preference;
 import android.preference.TwoStatePreference;
 import android.support.v7.app.AlertDialog;
 
+import java.util.List;
+
 import com.mapswithme.country.ActiveCountryTree;
 import com.mapswithme.maps.BuildConfig;
 import com.mapswithme.maps.Framework;
@@ -17,8 +19,6 @@ import com.mapswithme.util.Yota;
 import com.mapswithme.util.statistics.AlohaHelper;
 import com.mapswithme.util.statistics.Statistics;
 
-import java.util.List;
-
 public class MapPrefsFragment extends BaseXmlSettingsFragment
 {
   private final StoragePathManager mPathManager = new StoragePathManager();
@@ -122,6 +122,34 @@ public class MapPrefsFragment extends BaseXmlSettingsFragment
     else
       getPreferenceScreen().removePreference(pref);
 
+    Framework.Params3dMode _3d = new Framework.Params3dMode();
+    Framework.nativeGet3dMode(_3d);
+
+    final TwoStatePreference pref3d = (TwoStatePreference)findPreference(getString(R.string.pref_3d));
+    final TwoStatePreference pref3dBuildings = (TwoStatePreference)findPreference(getString(R.string.pref_3d_buildings));
+    pref3d.setChecked(_3d.enabled);
+    pref3dBuildings.setChecked(_3d.buildings);
+
+    pref3d.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+    {
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue)
+      {
+        Framework.nativeSet3dMode((Boolean)newValue, pref3dBuildings.isChecked());
+        return true;
+      }
+    });
+
+    pref3dBuildings.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+    {
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue)
+      {
+        Framework.nativeSet3dMode(pref3d.isChecked(), (Boolean)newValue);
+        return true;
+      }
+    });
+
     pref = findPreference(getString(R.string.pref_yota));
     if (Yota.isFirstYota())
       pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener()
diff --git a/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java b/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
index 7f22602722..ed790ac6dc 100644
--- a/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
@@ -13,7 +13,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.sound.LanguageData;
 import com.mapswithme.maps.sound.TtsPlayer;
@@ -152,34 +151,6 @@ public class RoutePrefsFragment extends PreferenceFragment
     mPrefEnabled = (TwoStatePreference) findPreference(getString(R.string.pref_tts_enabled));
     mPrefLanguages = (ListPreference) findPreference(getString(R.string.pref_tts_language));
     update();
-
-    Framework.Params3dMode _3d = new Framework.Params3dMode();
-    Framework.nativeGet3dMode(_3d);
-
-    final TwoStatePreference pref3d = (TwoStatePreference)findPreference(getString(R.string.pref_3d));
-    final TwoStatePreference pref3dBuildings = (TwoStatePreference)findPreference(getString(R.string.pref_3d_buildings));
-    pref3d.setChecked(_3d.enabled);
-    pref3dBuildings.setChecked(_3d.buildings);
-
-    pref3d.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
-    {
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue)
-      {
-        Framework.nativeSet3dMode((Boolean)newValue, pref3dBuildings.isChecked());
-        return true;
-      }
-    });
-
-    pref3dBuildings.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
-    {
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue)
-      {
-        Framework.nativeSet3dMode(pref3d.isChecked(), (Boolean)newValue);
-        return true;
-      }
-    });
   }
 
   @Override