diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index e1508f6ba2..db085436cd 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -65,8 +65,11 @@
 		<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@mipmap/icon" android:value="" />
         <activity android:name="net.osmand.plus.activities.HelpActivity" />
         <activity android:name="net.osmand.plus.activities.ExitActivity" />
-        
-        <provider
+		<activity android:name=".activities.ServerActivity"
+				  android:label="@string/shared_string_settings"
+				  android:configChanges="keyboardHidden|orientation" />
+
+		<provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.plus.fileprovider"
             android:exported="false"
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 9506fac030..c68e1eb3f1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -1009,6 +1009,20 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 		*/
 
+		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.web_server, mapActivity)
+				.setId("SERVER_ID")
+				.setIcon(R.drawable.mm_shop_computer)
+				.setListener(new ItemClickListener() {
+					@Override
+					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
+						app.logEvent("drawer_help_open");
+						Intent intent = new Intent(mapActivity, ServerActivity.class);
+						intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+						mapActivity.startActivity(intent);
+						return true;
+					}
+				}).createItem());
+
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.shared_string_help, mapActivity)
 				.setId(DRAWER_HELP_ID)
 				.setIcon(R.drawable.ic_action_help)