diff --git a/OsmAnd/res/layout/preference_activity.xml b/OsmAnd/res/layout/preference_activity.xml
index f439357ab3..4b83fa8efc 100644
--- a/OsmAnd/res/layout/preference_activity.xml
+++ b/OsmAnd/res/layout/preference_activity.xml
@@ -7,7 +7,7 @@
 			  tools:context="com.antonioleiva.materialeverywhere.SettingsActivity" >
 
 	<android.support.v7.widget.Toolbar
-			android:id="@+id/abp__toolbar"
+			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:background="?attr/colorPrimary"
@@ -24,7 +24,7 @@
 				android:layout_height="match_parent" />
 
 		<ImageView
-				android:id="@+id/abp__shadowView"
+				android:id="@+id/shadowView"
 				android:layout_width="match_parent"
 				android:layout_height="@dimen/abp__shadow_height"
 				android:src="@drawable/preference_activity_action_bar_shadow"
diff --git a/OsmAnd/src/net/osmand/access/SettingsAccessibilityActivity.java b/OsmAnd/src/net/osmand/access/SettingsAccessibilityActivity.java
index f449ce9019..20cacfdbd4 100644
--- a/OsmAnd/src/net/osmand/access/SettingsAccessibilityActivity.java
+++ b/OsmAnd/src/net/osmand/access/SettingsAccessibilityActivity.java
@@ -19,7 +19,7 @@ public class SettingsAccessibilityActivity extends SettingsBaseActivity {
 	private ListPreference accessibilityModePreference;
 	private ListPreference directionStylePreference;
 
-	
+
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
index 5b352737ca..65721dfc5f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
@@ -16,8 +16,6 @@ public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
 	private Toolbar _toolbar;
 	private View _shadowView;
 
-	protected abstract int getPreferencesXmlId();
-
 	public Toolbar getToolbar() {
 		return _toolbar;
 	}
@@ -27,14 +25,13 @@ public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
 	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.preference_activity);
-		_toolbar = (Toolbar) findViewById(R.id.abp__toolbar);
+		_toolbar = (Toolbar) findViewById(R.id.toolbar);
 		if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-			_shadowView = findViewById(R.id.abp__shadowView);
+			_shadowView = findViewById(R.id.shadowView);
 			final ViewGroup parent = (ViewGroup) _shadowView.getParent();
 			parent.removeView(_shadowView);
 			_shadowView = null;
 		}
-		addPreferencesFromResource(getPreferencesXmlId());
 		_toolbar.setClickable(true);
 		_toolbar.setNavigationIcon(getResIdFromAttribute(this, R.attr.homeAsUpIndicator));
 		_toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@@ -58,7 +55,7 @@ public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
 			ViewCompat.setElevation(_toolbar, enable ? 4 : 0);
 		} else {
 			if (_shadowView == null)
-				_shadowView = findViewById(R.id.abp__shadowView);
+				_shadowView = findViewById(R.id.shadowView);
 			_shadowView.setVisibility(enable ? View.VISIBLE : View.GONE);
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 9b30725a63..7938199585 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -134,8 +134,8 @@ public class MapActivity extends AccessibleActivity {
 		app = getMyApplication();
 		settings = app.getSettings();
 		app.applyTheme(this);
-		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		super.onCreate(savedInstanceState);
 		// Full screen is not used here
 		//getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		setContentView(R.layout.main);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index f7d133a6b2..b778841524 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -27,10 +27,6 @@ public class SettingsActivity extends SettingsBaseActivity {
 	private Preference routing;
 	private Preference about;
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
 
 	@Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index 8a8429b5f8..42bd866aca 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -300,20 +300,16 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 		return false;
 	}
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
 
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		((OsmandApplication) getApplication()).applyTheme(this);
 		//getToolbar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
 		//getToolbar().setDisplayHomeAsUpEnabled(true);
-		getToolbar().setTitle(R.string.settings_activity);
+
 		// R.drawable.tab_settings_screen_icon
 		super.onCreate(savedInstanceState);
-		
+		getToolbar().setTitle(R.string.settings_activity);
 		settings = getMyApplication().getSettings();
 		
 		if (profileSettings) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 2ff2e02fe1..a86eba9c32 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -62,10 +62,6 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 	private ListPreference drivingRegionPreference;
 
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
 
 	@Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index 4618ccf46b..727454cc80 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -91,7 +91,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 			startActivityForResult(intent, DEVICE_ADMIN_REQUEST);
 		}
 	};
-	
+
+
 	private void createUI() {
 		addPreferencesFromResource(R.xml.navigation_settings);
 		PreferenceScreen screen = getPreferenceScreen();
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java
index 696e2c2dbb..3c7de2d198 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java
@@ -33,10 +33,6 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity {
 
 	private static final Log log = PlatformUtil.getLog(AudioVideoNotesPlugin.class);
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
 
 	@Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index 4f349070e9..6dceced7fa 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -26,11 +26,6 @@ import android.view.View;
 public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
-
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 635a580c3b..937b6bdc3a 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -71,9 +71,9 @@ public class DownloadActivity extends BaseDownloadActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		super.onCreate(savedInstanceState);
 		updateDownloads();
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		setProgressBarIndeterminateVisibility(false);
 
 		setContentView(R.layout.tab_content);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
index 119bbf2fed..3a5991c976 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
@@ -36,11 +36,6 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
 		super(true);
 	}
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
-
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java
index f654571f25..e179a5f857 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java
@@ -15,11 +15,6 @@ import android.text.InputType;
 public class SettingsOsmEditingActivity extends SettingsBaseActivity {
 
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
-
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
index 376754b89e..34de6b6640 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
@@ -35,11 +35,6 @@ public class SettingsOsMoActivity extends SettingsBaseActivity {
 	public static final int[] MINUTES = new int[] {2, 3, 5};
 
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
-
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
index 073d839ad0..0987688ff1 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
@@ -24,10 +24,6 @@ public class SettingsRasterMapsActivity extends SettingsBaseActivity {
 	public static final String MORE_VALUE = "MORE_VALUE";
 	public static final String DEFINE_EDIT = "DEFINE_EDIT";
 
-	@Override
-	protected int getPreferencesXmlId() {
-		return 0;
-	}
 
 	@Override
     public void onCreate(Bundle savedInstanceState) {