diff --git a/app/jni/i2pd b/app/jni/i2pd
index 7015bad..436a3e7 160000
--- a/app/jni/i2pd
+++ b/app/jni/i2pd
@@ -1 +1 @@
-Subproject commit 7015bad905cf6bfcd36a35ce64c0f8ad32100a6d
+Subproject commit 436a3e7f54d1b0a70fe93dda4ac06829d2111759
diff --git a/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java b/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
index 162d488..df99e39 100644
--- a/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
+++ b/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
@@ -150,8 +150,8 @@ public class DaemonWrapper {
 
     public void changeDataDir(String dataDir, Boolean updateAssets) {
         I2PD_JNI.setDataDir(dataDir);
-	if( updateAssets ) processAssets();
-	//ToDo: move old dir to new dir?
+        if( updateAssets ) processAssets();
+        //ToDo: move old dir to new dir?
     }
 
     public boolean isStartedOkay() {
diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
index 42a1092..0e67bbb 100644
--- a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
+++ b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
@@ -505,6 +505,6 @@ public class I2PDActivity extends Activity {
         } catch (Throwable tr) {
             Log.e(TAG, "", tr);
         }
-        //System.exit(0);
+        System.exit(0);
     }
 }
diff --git a/app/src/main/res/menu/options_main.xml b/app/src/main/res/menu/options_main.xml
index 292821c..b938904 100644
--- a/app/src/main/res/menu/options_main.xml
+++ b/app/src/main/res/menu/options_main.xml
@@ -29,6 +29,6 @@
         <item
             android:id="@+id/action_stop"
             android:orderInCategory="99"
-            android:title="@string/action_stop" />
+            android:title="@string/action_exit" />
     </group>
 </menu>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6a0ebae..c97de3e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -5,6 +5,7 @@
 
     <string name="action_start">Запустить</string>
     <string name="action_stop">Остановить</string>
+    <string name="action_exit">Выход</string>
     <string name="action_graceful_stop">Корректная остановка</string>
     <string name="action_cancel_graceful_stop">Отменить корректную остановку</string>
     <string name="action_reload_tunnels_config">Перезагрузить туннели</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a45068..66acd5a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
 
     <string name="action_start">Start</string>
     <string name="action_stop">Stop</string>
+    <string name="action_exit">Exit</string>
     <string name="action_graceful_stop">Graceful Stop</string>
     <string name="action_cancel_graceful_stop">Cancel Graceful Stop</string>
     <string name="action_reload_tunnels_config">Reload tunnels</string>
diff --git a/fastlane/metadata/android/en-US/changelogs/23700.txt b/fastlane/metadata/android/en-US/changelogs/23700.txt
new file mode 100644
index 0000000..b16ce3d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/23700.txt
@@ -0,0 +1,2 @@
+* Updated codebase to 2.37.0
+* Changes in main activity
\ No newline at end of file