From 51b8c0722004a2a67ee0bbb3ecbe8983bf160119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Tue, 14 Apr 2026 18:38:32 +0200
Subject: [PATCH 1/6] Pass app cache directory to Go for debug bundle temp
 files

Pass context.getCacheDir() through AndroidPlatformFiles so the Go
debug bundle generator can create temporary zip files in a writable
directory instead of /data/local/tmp/.
---
 netbird                                                  | 2 +-
 .../io/netbird/client/tool/AndroidPlatformFiles.java     | 9 ++++++++-
 .../main/java/io/netbird/client/tool/EngineRunner.java   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/netbird b/netbird
index 4eed459f..b3178255 160000
--- a/netbird
+++ b/netbird
@@ -1 +1 @@
-Subproject commit 4eed459f27bd7e90faa7fe99e1edf4a59dc71265
+Subproject commit b3178255c0a3c487e114e282593d45ed5f147d3e
diff --git a/tool/src/main/java/io/netbird/client/tool/AndroidPlatformFiles.java b/tool/src/main/java/io/netbird/client/tool/AndroidPlatformFiles.java
index cbac637b..b65e2440 100644
--- a/tool/src/main/java/io/netbird/client/tool/AndroidPlatformFiles.java
+++ b/tool/src/main/java/io/netbird/client/tool/AndroidPlatformFiles.java
@@ -5,10 +5,12 @@
 public class AndroidPlatformFiles implements PlatformFiles {
     private final String configurationFilePath;
     private final String stateFilePath;
+    private final String cacheDir;
 
-    public AndroidPlatformFiles(String configurationFilePath, String stateFilePath) {
+    public AndroidPlatformFiles(String configurationFilePath, String stateFilePath, String cacheDir) {
         this.configurationFilePath = configurationFilePath;
         this.stateFilePath = stateFilePath;
+        this.cacheDir = cacheDir;
     }
 
     @Override
@@ -20,4 +22,9 @@ public String configurationFilePath() {
     public String stateFilePath() {
         return stateFilePath;
     }
+
+    @Override
+    public String cacheDir() {
+        return cacheDir;
+    }
 }
diff --git a/tool/src/main/java/io/netbird/client/tool/EngineRunner.java b/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
index 703cbd4d..66719918 100644
--- a/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
+++ b/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
@@ -91,7 +91,7 @@ private synchronized void runClient(@Nullable URLOpener urlOpener, boolean isAnd
 
             // Create fresh PlatformFiles with current config/state paths
             // This allows profile switching without recreating the entire Client
-            var platformFiles = new AndroidPlatformFiles(configurationFilePath, stateFilePath);
+            var platformFiles = new AndroidPlatformFiles(configurationFilePath, stateFilePath, context.getCacheDir().getAbsolutePath());
             Log.d(LOGTAG, "Running engine with config: " + configurationFilePath + ", state: " + stateFilePath);
 
             try {

From 92acfab574a1e070bcbae9031b643e50bca001bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Tue, 14 Apr 2026 18:50:30 +0200
Subject: [PATCH 2/6] Update netbird submodule with logcat debug bundle support

---
 netbird | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbird b/netbird
index b3178255..1d792f0b 160000
--- a/netbird
+++ b/netbird
@@ -1 +1 @@
-Subproject commit b3178255c0a3c487e114e282593d45ed5f147d3e
+Subproject commit 1d792f0b532ea96b926c166e77fe345cdd512b5c

From 401ec499d255e9bf0468ad78fd6a3a6e91064e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Tue, 14 Apr 2026 19:19:57 +0200
Subject: [PATCH 3/6] Add Troubleshoot fragment with debug bundle upload

Move trace log toggle and log sharing from Advanced to a new
Troubleshoot fragment accessible via the drawer menu. Replace
the old logcat share with debug bundle generation and upload
that copies the upload key to clipboard. Add anonymize toggle.
Works with or without a running engine.
---
 .../java/io/netbird/client/MainActivity.java  |   8 ++
 .../io/netbird/client/ServiceAccessor.java    |   2 +
 .../client/ui/advanced/AdvancedFragment.java  |  36 -------
 .../ui/troubleshoot/TroubleshootFragment.java |  90 ++++++++++++++++
 .../res/drawable/ic_menu_troubleshoot.xml     |  11 ++
 app/src/main/res/layout/fragment_advanced.xml |  59 +---------
 .../main/res/layout/fragment_troubleshoot.xml | 102 ++++++++++++++++++
 .../main/res/menu/activity_main_drawer.xml    |  16 +--
 .../main/res/navigation/mobile_navigation.xml |   6 ++
 app/src/main/res/values/strings.xml           |   3 +
 netbird                                       |   2 +-
 .../io/netbird/client/tool/EngineRunner.java  |   8 ++
 .../io/netbird/client/tool/VPNService.java    |   4 +
 13 files changed, 246 insertions(+), 101 deletions(-)
 create mode 100644 app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java
 create mode 100644 app/src/main/res/drawable/ic_menu_troubleshoot.xml
 create mode 100644 app/src/main/res/layout/fragment_troubleshoot.xml

diff --git a/app/src/main/java/io/netbird/client/MainActivity.java b/app/src/main/java/io/netbird/client/MainActivity.java
index b8fd1517..c7fb0b54 100644
--- a/app/src/main/java/io/netbird/client/MainActivity.java
+++ b/app/src/main/java/io/netbird/client/MainActivity.java
@@ -413,6 +413,14 @@ public void deselectRoute(String route) throws Exception {
         mBinder.deselectRoute(route);
     }
 
+    @Override
+    public String debugBundle(boolean anonymize) throws Exception {
+        if (mBinder == null) {
+            throw new Exception("VPN service not connected");
+        }
+        return mBinder.debugBundle(anonymize);
+    }
+
     @Override
     public void addRouteChangeListener(RouteChangeListener listener) {
         if (mBinder == null) {
diff --git a/app/src/main/java/io/netbird/client/ServiceAccessor.java b/app/src/main/java/io/netbird/client/ServiceAccessor.java
index bf17e443..d37d399c 100644
--- a/app/src/main/java/io/netbird/client/ServiceAccessor.java
+++ b/app/src/main/java/io/netbird/client/ServiceAccessor.java
@@ -17,4 +17,6 @@ public interface ServiceAccessor {
 
     void addRouteChangeListener(RouteChangeListener listener);
     void removeRouteChangeListener(RouteChangeListener listener);
+
+    String debugBundle(boolean anonymize) throws Exception;
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/netbird/client/ui/advanced/AdvancedFragment.java b/app/src/main/java/io/netbird/client/ui/advanced/AdvancedFragment.java
index ed060c57..3f1e2a7c 100644
--- a/app/src/main/java/io/netbird/client/ui/advanced/AdvancedFragment.java
+++ b/app/src/main/java/io/netbird/client/ui/advanced/AdvancedFragment.java
@@ -1,6 +1,5 @@
 package io.netbird.client.ui.advanced;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -20,7 +19,6 @@
 import io.netbird.client.R;
 import io.netbird.client.databinding.ComponentSwitchBinding;
 import io.netbird.client.databinding.FragmentAdvancedBinding;
-import io.netbird.client.tool.Logcat;
 import io.netbird.client.tool.Preferences;
 import io.netbird.client.tool.ProfileManagerWrapper;
 
@@ -103,28 +101,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
             setPreSharedKey(presharedKey, inflater.getContext());
         });
 
-        // Enable trace logs
         Preferences preferences = new Preferences(inflater.getContext());
-        binding.switchTraceLog.setChecked(preferences.isTraceLogEnabled());
-
-        // Handle trace log switch toggle
-        binding.switchTraceLog.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (isChecked) {
-                preferences.enableTraceLog();
-            } else {
-                preferences.disableTraceLog();
-            }
-        });
-        
-        // Make parent layout clickable to toggle switch (for TV remote)
-        binding.traceLogLayout.setOnClickListener(v -> {
-            binding.switchTraceLog.toggle();
-        });
-
-        // Handle "Share Logs" button click
-        binding.buttonShareLogs.setOnClickListener(v -> {
-            shareLog();
-        });
 
         // Rosenpass settings
         try {
@@ -362,17 +339,4 @@ private boolean hasPreSharedKey(Context context) {
         }
     }
 
-    private void shareLog() {
-        Activity activity = getActivity();
-        if (activity == null) {
-            return;
-        }
-
-        try {
-            Logcat logcat = new Logcat(activity);
-            logcat.dump();
-        } catch (Exception e) {
-            Log.e(LOGTAG, "failed to dump log", e);
-        }
-    }
 }
diff --git a/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java b/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java
new file mode 100644
index 00000000..a3f6aae9
--- /dev/null
+++ b/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java
@@ -0,0 +1,90 @@
+package io.netbird.client.ui.troubleshoot;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import io.netbird.client.R;
+import io.netbird.client.ServiceAccessor;
+import io.netbird.client.databinding.FragmentTroubleshootBinding;
+import io.netbird.client.tool.Preferences;
+
+public class TroubleshootFragment extends Fragment {
+
+    private static final String LOGTAG = "TroubleshootFragment";
+    private FragmentTroubleshootBinding binding;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentTroubleshootBinding.inflate(inflater, container, false);
+
+        Preferences preferences = new Preferences(inflater.getContext());
+        binding.switchTraceLog.setChecked(preferences.isTraceLogEnabled());
+
+        binding.switchTraceLog.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                preferences.enableTraceLog();
+            } else {
+                preferences.disableTraceLog();
+            }
+        });
+
+        binding.traceLogLayout.setOnClickListener(v -> {
+            binding.switchTraceLog.toggle();
+        });
+
+        binding.anonymizeLayout.setOnClickListener(v -> {
+            binding.switchAnonymize.toggle();
+        });
+
+        binding.buttonDebugBundle.setOnClickListener(v -> {
+            generateDebugBundle();
+        });
+
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    private void generateDebugBundle() {
+        Activity activity = getActivity();
+        if (activity == null || !(activity instanceof ServiceAccessor)) {
+            return;
+        }
+
+        boolean anonymize = binding.switchAnonymize.isChecked();
+        binding.buttonDebugBundle.setEnabled(false);
+        new Thread(() -> {
+            try {
+                String key = ((ServiceAccessor) activity).debugBundle(anonymize);
+                activity.runOnUiThread(() -> {
+                    binding.buttonDebugBundle.setEnabled(true);
+                    ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
+                    ClipData clip = ClipData.newPlainText("Debug bundle key", key);
+                    clipboard.setPrimaryClip(clip);
+                    Toast.makeText(activity, "Debug bundle key copied to clipboard", Toast.LENGTH_SHORT).show();
+                });
+            } catch (Exception e) {
+                Log.e(LOGTAG, "failed to create debug bundle", e);
+                activity.runOnUiThread(() -> {
+                    binding.buttonDebugBundle.setEnabled(true);
+                    Toast.makeText(activity, "Failed to create debug bundle: " + e.getMessage(), Toast.LENGTH_LONG).show();
+                });
+            }
+        }).start();
+    }
+}
diff --git a/app/src/main/res/drawable/ic_menu_troubleshoot.xml b/app/src/main/res/drawable/ic_menu_troubleshoot.xml
new file mode 100644
index 00000000..9856cc1e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_troubleshoot.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "bug_report" outlined icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5s-0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8H4v2h2.09C6.04,10.33 6,10.66 6,11v1H4v2h2v1c0,0.34 0.04,0.67 0.09,1H4v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3H20v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1H20V8zM16,15c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4v-4c0,-2.21 1.79,-4 4,-4s4,1.79 4,4v4zM10,14h4v2h-4v-2zM10,10h4v2h-4v-2z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_advanced.xml b/app/src/main/res/layout/fragment_advanced.xml
index c25aa711..ad46aea4 100644
--- a/app/src/main/res/layout/fragment_advanced.xml
+++ b/app/src/main/res/layout/fragment_advanced.xml
@@ -76,63 +76,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/preshared_key" />
 
-            <View
-                android:id="@+id/separator"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/separator"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/btn_save" />
-
-            <LinearLayout
-                android:id="@+id/trace_log_layout"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/focus_highlight"
-                android:clickable="true"
-                android:focusable="true"
-                android:focusableInTouchMode="false"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="12dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/separator">
-
-                <TextView
-                    android:id="@+id/switchLabel"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/advanced_tracelog"
-                    android:textColor="@color/nb_txt_light"
-                    android:textSize="15sp" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/switch_trace_log"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:focusable="false" />
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/button_share_logs"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/btn_bg_orange"
-                android:focusable="true"
-                android:focusableInTouchMode="false"
-                android:foreground="@drawable/focus_highlight"
-                android:text="@string/advanced_share_logs"
-                android:textAllCaps="false"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/trace_log_layout" />
-
             <View
                 android:id="@+id/separator_rosenpass"
                 android:layout_width="0dp"
@@ -141,7 +84,7 @@
                 android:background="@drawable/separator"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/button_share_logs" />
+                app:layout_constraintTop_toBottomOf="@id/btn_save" />
 
             <LinearLayout
                 android:id="@+id/layout_rosenpas"
diff --git a/app/src/main/res/layout/fragment_troubleshoot.xml b/app/src/main/res/layout/fragment_troubleshoot.xml
new file mode 100644
index 00000000..4e04220c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_troubleshoot.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    tools:context=".ui.troubleshoot.TroubleshootFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxWidth="@dimen/fragment_max_width"
+            android:padding="40dp">
+
+            <LinearLayout
+                android:id="@+id/trace_log_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:id="@+id/switchLabel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/advanced_tracelog"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="15sp" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/switch_trace_log"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="false" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/anonymize_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/trace_log_layout">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/troubleshoot_anonymize"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="15sp" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/switch_anonymize"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="false" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/button_debug_bundle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/btn_bg_orange"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:foreground="@drawable/focus_highlight"
+                android:text="@string/troubleshoot_debug_bundle"
+                android:textAllCaps="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/anonymize_layout" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 19a6b4c6..bcbd34d0 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -16,16 +16,20 @@
             android:icon="@drawable/ic_menu_advanced"
             android:title="@string/menu_advanced" />
         <item
-            android:id="@+id/nav_about"
-            android:icon="@drawable/ic_menu_about"
-            android:title="@string/menu_about" />
+            android:id="@+id/nav_change_server"
+            android:icon="@drawable/ic_menu_change_server"
+            android:title="@string/menu_change_server" />
         <item
             android:id="@+id/nav_docs"
             android:icon="@drawable/ic_menu_docs"
             android:title="@string/menu_docs" />
         <item
-            android:id="@+id/nav_change_server"
-            android:icon="@drawable/ic_menu_change_server"
-            android:title="@string/menu_change_server" />
+            android:id="@+id/nav_troubleshoot"
+            android:icon="@drawable/ic_menu_troubleshoot"
+            android:title="@string/menu_troubleshoot" />
+        <item
+            android:id="@+id/nav_about"
+            android:icon="@drawable/ic_menu_about"
+            android:title="@string/menu_about" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index a49b0332..3f749393 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -18,6 +18,12 @@
         android:label="@string/menu_advanced"
         tools:layout="@layout/fragment_advanced" />
 
+    <fragment
+        android:id="@+id/nav_troubleshoot"
+        android:name="io.netbird.client.ui.troubleshoot.TroubleshootFragment"
+        android:label="@string/menu_troubleshoot"
+        tools:layout="@layout/fragment_troubleshoot" />
+
     <fragment
         android:id="@+id/nav_about"
         android:name="io.netbird.client.ui.about.AboutFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7bd292b6..d6b1f51b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="menu_docs">Docs</string>
     <string name="menu_change_server">Change Server</string>
     <string name="menu_profiles">Profiles</string>
+    <string name="menu_troubleshoot">Troubleshoot</string>
 
     <string name="main_status_disconnected">Disconnected</string>
     <string name="main_desc_bg_mask">background mask</string>
@@ -77,6 +78,8 @@
     <string name="advanced_presharedkey_save_error">Failed to save pre-shared key</string>
     <string name="advanced_tracelog">Enable trace log level.</string>
     <string name="advanced_share_logs">Share logs</string>
+    <string name="troubleshoot_debug_bundle">Upload debug bundle</string>
+    <string name="troubleshoot_anonymize">Anonymize sensitive data</string>
     <string name="advanced_rosenpass">Enable Rosenpass</string>
     <string name="advanced_rosenpass_permissive">Enable Rosenpass permissive mode.</string>
     <string name="advanced_title_network_security">Network &amp; Security</string>
diff --git a/netbird b/netbird
index 1d792f0b..a35ecf9a 160000
--- a/netbird
+++ b/netbird
@@ -1 +1 @@
-Subproject commit 1d792f0b532ea96b926c166e77fe345cdd512b5c
+Subproject commit a35ecf9aa8d8867df5f13a98840e152aa2cda0b4
diff --git a/tool/src/main/java/io/netbird/client/tool/EngineRunner.java b/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
index 66719918..d25334f0 100644
--- a/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
+++ b/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
@@ -214,6 +214,14 @@ public void renewTUN(int fd) {
         }
     }
 
+    public String debugBundle(boolean anonymize) throws Exception {
+        String configPath = profileManager.getActiveConfigPath();
+        String statePath = profileManager.getActiveStateFilePath();
+        String cacheDir = context.getCacheDir().getAbsolutePath();
+        var platformFiles = new AndroidPlatformFiles(configPath, statePath, cacheDir);
+        return goClient.debugBundle(platformFiles, anonymize);
+    }
+
     public void selectRoute(String route) throws Exception {
         Log.d(LOGTAG, String.format("selecting route: %s", route));
         try {
diff --git a/tool/src/main/java/io/netbird/client/tool/VPNService.java b/tool/src/main/java/io/netbird/client/tool/VPNService.java
index 548ae3ce..8494d48d 100644
--- a/tool/src/main/java/io/netbird/client/tool/VPNService.java
+++ b/tool/src/main/java/io/netbird/client/tool/VPNService.java
@@ -239,6 +239,10 @@ public void removeRouteChangeListener(RouteChangeListener listener) {
             }
         }
 
+        public String debugBundle(boolean anonymize) throws Exception {
+            return engineRunner.debugBundle(anonymize);
+        }
+
         public void selectRoute(String route) throws Exception {
             engineRunner.selectRoute(route);
         }

From 883f174083c24c0bb3dbe7fad5ed209d33e0b7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Tue, 14 Apr 2026 19:39:55 +0200
Subject: [PATCH 4/6] Replace drawer menu PNG icons with Material outlined
 vectors

Remove density-specific PNG icons and replace with vector drawables
using Material Design outlined style for consistent appearance.
---
 app/src/main/res/drawable-hdpi/ic_menu_about.png | Bin 844 -> 0 bytes
 .../main/res/drawable-hdpi/ic_menu_advanced.png  | Bin 970 -> 0 bytes
 .../res/drawable-hdpi/ic_menu_change_server.png  | Bin 695 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_menu_docs.png  | Bin 904 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_menu_about.png | Bin 493 -> 0 bytes
 .../main/res/drawable-mdpi/ic_menu_advanced.png  | Bin 550 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_change_server.png  | Bin 453 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_menu_docs.png  | Bin 530 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_menu_about.png    | Bin 875 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_menu_advanced.png | Bin 992 -> 0 bytes
 .../res/drawable-xhdpi/ic_menu_change_server.png | Bin 767 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_menu_docs.png | Bin 959 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_menu_about.png   | Bin 1673 -> 0 bytes
 .../res/drawable-xxhdpi/ic_menu_advanced.png     | Bin 1985 -> 0 bytes
 .../drawable-xxhdpi/ic_menu_change_server.png    | Bin 1455 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_menu_docs.png    | Bin 1855 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_menu_about.png  | Bin 1361 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_menu_advanced.png    | Bin 1593 -> 0 bytes
 .../drawable-xxxhdpi/ic_menu_change_server.png   | Bin 1115 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_menu_docs.png   | Bin 1494 -> 0 bytes
 app/src/main/res/drawable/ic_menu_about.xml      |  11 +++++++++++
 app/src/main/res/drawable/ic_menu_advanced.xml   |  11 +++++++++++
 .../main/res/drawable/ic_menu_change_server.xml  |  11 +++++++++++
 app/src/main/res/drawable/ic_menu_docs.xml       |  11 +++++++++++
 24 files changed, 44 insertions(+)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_menu_about.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_menu_advanced.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_menu_change_server.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_menu_docs.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_menu_about.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_menu_advanced.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_menu_change_server.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_menu_docs.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_about.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_advanced.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_change_server.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_docs.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_about.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_advanced.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_change_server.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_docs.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_menu_about.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_menu_advanced.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_menu_change_server.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_menu_docs.png
 create mode 100644 app/src/main/res/drawable/ic_menu_about.xml
 create mode 100644 app/src/main/res/drawable/ic_menu_advanced.xml
 create mode 100644 app/src/main/res/drawable/ic_menu_change_server.xml
 create mode 100644 app/src/main/res/drawable/ic_menu_docs.xml

diff --git a/app/src/main/res/drawable-hdpi/ic_menu_about.png b/app/src/main/res/drawable-hdpi/ic_menu_about.png
deleted file mode 100644
index dbe0a307a060f86881c2051fc899014986acf453..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0009MNkl<ZcwX&S
z`D;@_5PnhXeOu9Zpx8((p*h~mDG^e^6APlI_*1o7+JY#QRx9-iN>h(|q}1!b_4~}E
zgmGWqzQ+ER4~Bi&Z)SIPcV>3uI6d^x!@r2dV%t2=>(68|hvV`19?fq!#DO8#b;r@x
z(f-P2v%gz{zGd`1LR(HIle@J2e?zTS+k{Clm-`0oPmxdf{R}dR?+G|GgLVn+syJ6i
zd#O^XY}ey;g;J@s0|Sq7H^h<YVzD@gcBj@wUmuR|6!dT7yCF97g+k$o)?F7E7Z~)Z
ztoS(`Ijwd40R4Tidq}4sAHvug!PP=$Wx&bxY&~qY@YrN$>)q^B1OwdU&M-(5iNsc|
z5C#}yM2>F`KO>qCL@t**DZ#lIl+O8l{!l8FI_`9sh)Ds5rX(9Hnh!z*Mh|F=0L^N$
z9Xt}OdI_?EMV!%mJD?MVe1p963<=?ja=Cl}&V1$WaAlfrN3~krEE6<PcTQ+tfnjh@
zj&4YkzJNhdV&{hDOklA@jP2I_Ccu$%vh!n_^939kmCPE{oC(YvOf=whh@lp|X6Al}
zymBn`{{qTS7!$TBN`0*QqwQ4z{kPP&E+Z_2kT2<UdcWpOpgtz~j0Nn~oC(mK52H_m
zSq3$(jDwmpA*@3f`vvrugUZPopgh5IW-Zd331J<gE~L(qp*bUv0oRxbII{DaGa-ya
z(Ce2hd#pKMV1gJ7e?X=+XF^DahNYxj(VQ<})CZ#)kB!%Y<~3{`l5rOxtN4y;z9TTn
zMOn#sP_?#o2znP}%=?aQ4Qhck0)`6`+&Rs+gFG<ebeM!Y!rJ3C@4Ta$w*ntjbVzE_
zS<Tym>5Xw-yUjc7vgShptIErnuRsbx$EU#;0PGj(48BLh+MB=|y1+u|N#?OW1q>Wv
zGC;QqY0wT1-LkGb7KrfSj)7k?D0z%%XE4cCJj@c{jxjFKKY;!U`loozqWfNA&^Nx;
zjn-cw$ecK}_J6Ehcsyupkn6S=ZdZ_3V$^NEo9?hQWScL{yXYTgGVqP0?Rw~8qwxo5
W=n6U066^>70000<MNUMnLSTXi+>zJ-

diff --git a/app/src/main/res/drawable-hdpi/ic_menu_advanced.png b/app/src/main/res/drawable-hdpi/ic_menu_advanced.png
deleted file mode 100644
index d2ffac1f2bb5de5fac4ffd8f5de4cfbaa7cde984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000A#Nkl<ZcwX&S
z`D+tV5Kh#1M7)dlfi}`;B-bXXF{Q++NPo}<AyTnYBK4r9C1OD<9#L#PX`5hB|69M$
z%){5|cDpI2KjniVyK}#pd2e3=fiAk}Vikh@{r!96@%Uj<E|)t*o>tlvq*AHlj^oT_
zGMV3szJj0D`W;0i64`;k^9bAoJ;(Dy5}qeP4bU<YKBMhAhD0I}V>Qz0bS0o#ghcY-
z|3XqFoB!Vc$01M@2^6^MTCKJP0dF!Pybo&qY&LsJDmR1IAbxwGn*%?I=djjq3;BG0
z7lK#e=%>ub54^v_dmYb92y#^0u$_><rVW3oC)H%t-lMuFw2fZ`5%4aZIjuRl!2om&
z`T}yOqm2mcxRcO*A&Zy?4dZ=W7WOKzhMgza9##ZSJ|Mtu!!H(#+iX2Ah^`49#3CL^
zl0{3+7ufr08Y8ic7H$;qd5kSYVjt~Au8U+cxgSQ0>^X;6%MDP0ozNRXkSUq95^c4f
z1y<?4ROylyu8Dzxfdfp416(ebw`w_o6Z!}fmKoy!Hzg1&5ZC$wCNxGp9vxcfg&>Tc
z$j+GT>+9R&B7Y_WUSV?lY@of@m>7p1JM^G!z<Gkrh|J}Ji%)N`N-&(|YPc#}#$6=*
zsvdH-O=LqhAFaH?N-|me_S!PvV7p-a4fGilGJH6_%%C_HuG{(qc;^@x@&`5_yr--l
zDtXrCw}T*z6EYuf?BV8&$n2DD10$1GuaH51lzdcbL|4@p;Gn=239a~gb9c!sd<UI2
zd_0Fib6f=G>7s4JIb*xH5XeTocJC_4@xQ>JY=M>&oDr#Bor4X%F%uBH3Acb8e5dtU
zY4V$=<!b^4J)mV6&1#te142HSX<b7&tlV*n{M_&xsPzq?b4!x;e`k`GFi;(|Ps?pk
zR|dIvJzb}Db9l)GaHndyC)g6%z7@CfZv>o6@%gxIpDerSH=LyK8|LZiw9c6V=S<re
za2LsLyF*>xyXBtr3Dj`Aw)g^!qbx6z0xfV(xI&qMnOH2gUE2_l-&VTZjSb<AX#KVT
zCl^3fII6+v1Srj97>MVT*5^)wY>5k?F1I*--#V??x!QKC+(0MNqQ7?=1kB0mhm|Tn
z5$9P|9s|PSRVK8d!_Y6}kYo8-wW#@D#yJ6Ripjd&w>t_XQeq{{oY(~ZwAavg1pM$K
scnWkc^Y4GzI1fvnO<KQ;E;a*y0AW)|tV13IGynhq07*qoM6N<$g5uA^u>b%7

diff --git a/app/src/main/res/drawable-hdpi/ic_menu_change_server.png b/app/src/main/res/drawable-hdpi/ic_menu_change_server.png
deleted file mode 100644
index eba2e0ed91c80b9790eb34ad7609188770270614..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0007hNkl<ZcwX(6
z+iMe15XMu*3wQ$+1@*-m3=+*{bJ;{+(qdBtwNZ$^s4of?eDOuGAU2|StqQGL{crt!
z?JUHhk==De1@pl$n=_M{@64H<J-OTj6HG9{c+lx|_6`Pv9e#aVP%4%7)oQipK@iM)
zTc*h8^Lt2ire3di&^;2~KzGaKa#18Azh<*}1fQSS9t{6KGuV#15O|ILu4Kc)`VaI6
z^c{SUjg^opLZW3$yvFZ`$PCXV*3KiBkbA7Hn9pbQ!Z-*`5wuFsZxSUf7K{76Qv@9+
zWM=XE5>+l!LXAdaTEPjriiD%ym_ng&0Q(E%jfDSv&72T{b|Fi41TB`PyibHM3=iV_
z3i-H&%y|D)s8*|OYt;MRwk=?1&vaD0&L_Ps39Nb{y|>%jVuJvOkaa5bH1~(2iUa!a
zvMNoyz}sR&L(Y2Vrne;p^Qdgi-Sf8CP!k)WS#L`U2%T27H8Q*{HnJq7(P4z{dRuHj
z<eZhc?`=uJ+gi8HUG=uu&@{HDe(Y^YL5y2!YW0%0C4zRQa{Kip==b|OZ8(0?>+kKU
zVSzQdH$)dN@3RH;9lT=4b=w<LfhwIK-~bZuA|d#D3D2ST9|k`8`sR0V1v%>NsX(AW
zJG2JZ7hm5i$x9NJynh7x<*Z2Se>!?^PYrsg5)o2kq8GV*oyv`v-tBh#Fl2kkx;B9S
zocH-FM1&x-NP;DiLa(BqAlE9D%0+YwnaA%@uz4|4HQ(}F%Z(tO8U((e1SDS2<%{PI
ziI%Nezg=OCxQ^+1rf<|RTCLW`fE1zOb={e5;LSn0t4ir8M_u4D13Nu#<<|x6-++$F
duTAjZ;}>Y1*4XIr)2jdg002ovPDHLkV1n|-Qf>eM

diff --git a/app/src/main/res/drawable-hdpi/ic_menu_docs.png b/app/src/main/res/drawable-hdpi/ic_menu_docs.png
deleted file mode 100644
index 9529c358eb88832712fc72a2d2b0a7209a5adfeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0009|Nkl<ZcwX&S
zX-^YT6m8x26{9s8x0*^S-DbL(niLZkh$ciW@e_(-Au*Z|iWmfGG*ko>At3s1J%`>g
z^)j!WQux-B+`Q@B<=uC;dG-0)XrqnI2nK`uEz9bN$Kz*0q0mvy-*JcoU5P|u5NieN
zZ`-#2ID~hLc=rZtE)t0x*81Cqa=E+<n_#cR4Aym_1^j*wD&lzv4vk{{igi_-t6;sG
z&*u+ldo3ZG%^rl|0Y*a{8OdZaomdZPS-jhe^j(7d6Fe`A&O|z$KC5N71l9$Nj?0NZ
zz>&*Z#stV8hu$kX1^U*Et}A$2(3lu3ZYA{4*~7F+WGk&i$`1p5j0}r391ic(0uI1C
zlFQ{z;?b{p4q)Svq_5<wBWFZ1nY<{)IcsWXoc0(tdCiR^rPI{Yas-<Ka>JAZ<u$(%
z{7`yHWfZ8bnF2=exi~UqS38VpnKGpoya4DY=!@mj5JoWk*kFm#;mI_gph3_AXpXZ<
zB2Z+sQmNDxEic$Ogru%ZGmU^kMr!Aw<~g7ftS#0Ve>)CQ4{5uq<sCr&hD3fq^NfJu
ze(9`E&8tPBP}ogJ=o~j_lrqAqcJ3Nz+UK>nA^Z-s;<ZH)k&O-l&ERu!LGv|W`!k|6
zU(fOX0K?;;AF){Mgyy*c4wYDQsGZZA=LR@50s77^)jU@~c#Iq1lW|J(+`t1gvjJ>>
zg#4muoNNMwhnQ#6Owqswy)0<fhvvC~&VwqP;+p3Q6lf1S0V%tsd94DDbV!%I)jT6`
z+8`8vfkrgX4cH(L**<og=4n8#TSm%#%`<|bhf<koYgDLmVO!@WpqrXs3$Z&1TE%lf
z^Xmd9xFaVSG)-#<jE>Bqx}O8sx-B+e_`J>_2b>X5oRs2DYJRg|MBvOk))kmLr}>`1
z3l$xbnRH$Ay@KrxJD)f_vEI}CrhrqWB<CxjbfffX@Vf^6SvrH~{$};vz%O(fMwcw<
zJkF;EhW%^?$QD4$)PqBhJ<lBv@bltsRqs8#|Eysh#U>A;(P$XF^Q;TJzs3=O_rpxH
z$j(U(Hdn-6;QSQ=mBguk|Ho>H>A_kC_3r3@GY1Sk910|=_ok;D4R-a0`3&#7*$iHW
eWE*X4H~s>UVIGNx-FQ;~0000<MNUMnLSTaPIH~Xe

diff --git a/app/src/main/res/drawable-mdpi/ic_menu_about.png b/app/src/main/res/drawable-mdpi/ic_menu_about.png
deleted file mode 100644
index c84b3218bc10d4e31f68f123c4230457dbdb209b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005BNkl<ZcwX&Q
zOH0E*5N=ge6huMvs#3i~YMM6~p&rzOo`f8ID|qyxsHG5lwLUH?{#(D#?iMpPX<B;l
z;0H^R`R28=Gn+!;AA>{`MZ>=DPuaFTA-TRmXO?B{IF56V_YXWjx$ypo=b7ueOVTDc
zJkMLBBdiA2b`S&$rfE)>%jG#ZuORR-<ZlRa(etigyg_3)+KS_NNb(ve**x^_u<8gr
zDfx~-<|`}*GBYLD35H>eB9R*;b%oEO<Rywwj-k9S2?E?YvzBrmKDZay1(HiZ)%~?p
zDve2wT|_5556Ka5z6ZW0<q1IH01l3%T%%g8ju%qO0J~XsSQv&gl50a9*rt?gfV)H|
zElaru_$LHemGU;A@Bjr*$~DO2@Leg_0N=>ssc_q62blqI4$ql80C@<d6Dilo3Xtmz
z*hTCVb(p`<CBSaiF5=X(j%jlMuFfQ+T+cyT@C4K(zr&y+IW-@NHsvHEq3gVp{0)5<
z*{z{UHR4n|t(!LgU8KRg2!>78oq@2k#h<q+)~QP3-0t-@)nG~JTxH3!>Hk5K0a#9H
j(>KsrBLn}V{ds%=`f`4R%tp;I00000NkvXXu0mjfg^S)H

diff --git a/app/src/main/res/drawable-mdpi/ic_menu_advanced.png b/app/src/main/res/drawable-mdpi/ic_menu_advanced.png
deleted file mode 100644
index cb3ff32a37079d62b03f179ac722b52c8535cc2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005)Nkl<ZcwX&Q
zTT22#6y72#iY`R;TwsYVxHoloF~qktib^PYE$T^ph@@V+NYq0`MUq+nw(sPbn4MM=
zGw7iY4m)$^n>p8+)wF-~5|Kz`$aUTEXf!&8X`j0OBiOdR>Nrj#nM}TsV0;OgR(V|^
zkx0zKz^h>xIz{07{uGRqpxafs9fJ<DENce`WgrE}t-Ox4EOghVX)eG}5#tp^G$M0a
zf({3{j*SQS-a%>*SLWn$xnbyzC^8r;V|<=Ur7GHYwZX;#$}c=yXBBN|xv5&M_S2UN
zk0>5t&{H`9zzY+k2kIDgEuBu!!`lKJSPEOmzC6}WReb<t0Hk|FFe&S?c^Uc_czKBN
z73H4_u5dQNIg@o?Kp}%v2Kh!5jl$=eBxufQJi&Zh>|+ONR6n6>2{!UcrcQy!&oYNQ
z>rl+uU|!~gg1!5Q0R2BoI*y=$8W@6u!;hic68l61s8L+#LV=AI6&d6SS<eU5$!p4g
zn;LXh<ghOBJa3LJ6eL6UKwak!Yj1$_Pw&hIt9pA62q48M9guzQrY9%-CReC7+`1Pu
z*V;G}0MZeow+P~M#{}LYq%uqQ0fk@0w`ezC+s@u16)-YmH{YDNcug@c!RVgK?HcfS
ojnmQl|ABz6>w~}cNBgsQ2M&#!1ruI}5C8xG07*qoM6N<$g5p;55&!@I

diff --git a/app/src/main/res/drawable-mdpi/ic_menu_change_server.png b/app/src/main/res/drawable-mdpi/ic_menu_change_server.png
deleted file mode 100644
index 5f9e670115331ebf27cdfe88934f0c8ebe9c303c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004uNkl<ZcwX(4
z-zx-B6vuZ-6kbUww98^Lv$OMKr=&)NH^d4_iL&Ks^TOMt){9*tVgFm7o7q~YnK3JG
z_FJbt_k7Pe-+O1zy_rl8J*0tc+rI0%GcukUK@jxO#Kev)%c^1*rBZ22*Yz>Qv%WS>
zb4}Kz0>$$*uG8=_Y`n|*5dRkc1OF8N=2rp~yA;1+JJ>)c$2y0=CciJ_wYnB4m&@Z6
zzS3kxa+;=%(6|Br)HVccnU@HP&S`!r<9~vDK0l~-Un~}9B^L+s_c_&uj7P%rylIl(
zE0s#W<l?|)wh_6K@klV!a|k@kcoNjuB2bg@NQ8fIi#Z>bTpZZYF(PL&9*3;sI0sz_
zWD&TJnz%$zG{N{S8it|aFST#31l%gtRKp>;M5tY<PZi$c2mC#m1E;Hr<HU~SeuNTG
zHx;|1k>~sVP)KDt%_OlCHEr}>|5lh5?5vJ0TVGE_Q#HdHN;G_jYWO)>ml`w(+E0Lb
vQSql3VS{_JP$(2eWq#LC7p~*8{8M}aU;1WZSKQ3;00000NkvXXu0mjfCvVWA

diff --git a/app/src/main/res/drawable-mdpi/ic_menu_docs.png b/app/src/main/res/drawable-mdpi/ic_menu_docs.png
deleted file mode 100644
index 03cefc6e8a08a2c9c8f32a57b9d89abb10b3fe83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005mNkl<ZcwX&Q
z$w~u35KUB66huMvCMr>oNSw(mnL~t#7!P_9a|yUd@aRQxK^Sv2ZU?u&^}VD!wB;mD
zf(H*iXlCZs($&>fHHpMOeiNlqsW+F)jW~`oBxPNL&a&C;y6d`Ecz?t5gA4C>cpiD4
zH!E#o!}t9qI>M@A6@ws{wk&HjlgUiLxs8qY!M|XW<Bm@S<7FDd(OMXWJyNcLlubhK
z66*#V4@-F@5cxdQfygW=W2C$blS`-5{Rre7L7n0=Y09FIgmMVwEy=@q1^hdnHKc0J
z6!P+6_Xv4l^53BH{*+3k2237?3*euzrm)KRJ~QP?XA_%TOa2R>umcBslIO+Rw!NBY
zoTSW@NFDIwtgw7OKPF{Os0&+>yapU>Bhm+%A`RHyLuXO)O+eum3clnu)cv%~GwiD<
z4o~t;K;fd@2_QRZ6+OYzwLJlZyHGliyoS2`$Wn}T2dpBNTcJ=Glrq*oWpGrKG6MX@
zk5$C3Wga8?pbmC8D@yXZ58CEmLv`{i3~VWj0y~*~5x0};(6dOTqoomNk=vNG@n?|+
zXAul*EM0Ddlg*gZ6zfn0QE@t*rW&joI#*FLZTf#u;|5HpwCNhCtiE6Wqy2e&0syv#
Ubl(cmF#rGn07*qoM6N<$f^)3zA^-pY

diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_about.png b/app/src/main/res/drawable-xhdpi/ic_menu_about.png
deleted file mode 100644
index 4918376572fc6e2cae4fc2f79e06ae46d1894af9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 875
zcmV-x1C;!UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009rNkl<ZcwX&U
z&ubGw6b?c!MFjCu1QA38$sx(^<_8jlQV3p35A~9RC_xcLiY16ra>y|dLZAdn|69MW
zc`uzl+hlfjlSbGNhK0O&Kj+QNo0n3lK!E}U3T!LN<?_Q?t@gBDuRr6r*=#<tbG8bN
zM&n5w$DJfePBEq!mv(?Y!8nPc=pE-<8TSGh@(Kq1gkcxf;8g=W-?&0n=0?C2fe}4p
z&;>@nTCE=83%{b5G*G^E`Mr<1GsE|JqbbIyL+QvdU<~^X>6D#&8#s??L_SBxsMTt{
zwsUg_1E~>|w0V#3uAS!t@a=%V>!ja|^6k9bP^nbPj<RW95u+T)ooG;~$Ii(NL}t&4
zJX2=R&dCDG)0D#ZJXiT#YK(!i%xgJ0a9=!kf;1QohY#$WAVBbe7=MYA<c+203CdSp
zaH3=BsUgwV{Onu$GJvNm5&d9k%RoKi#54{(AQo_=pC)zWo>-jqzDFzpJujS9*thgl
zfPmi=gme3srLBTSGVRI{&MKT)nm5|*_G67iNbWQJSjdHJM)18=-L%8fy#NCu6|(8#
zi~3YI%MeTV0&5pZfr+L0KrX&Np%-2(_X6#(G%qAltZ^S$nh&sVz6$?$OY;Gp7ygfy
z<^?L2W&B}jK2ZKp2dFm-|Nrj*Qs7gT6w2y=rVvKY(!Aho;<2UqAO{DoDuCck%;QTU
z5Oj=Yalk!B!5>+=7u<`C7mKB@LKX+W(^lQV7a0KoXJSN1IS}jsOBdk{+J6f`z`jO;
zMV6&6L#P8R8l9Ctu=G@b^4&!GJZV=U)B)-dzA?s*rKd(bZ&;-+>XP|;fPBZ6b{E_S
zP3Gt;SWU*xlafzAJLfK>sYWGrW)l5DF40%Wqx)Q!HrGdY>E@%JPUJ2B3T|5k-$`hd
zX+b&3^*&oqTSZa-x3Sd?UFvv#KpbmOB=YNPY$>D>b)&V&R-x~^m-Argp_4L{F=ETo
z&RrYWjD-<j)Bs(PSem;mL)_*revh=d>qJ~f&)50fK?7qs@6!xA!M6NHqrMC*zNF)P
z5=#|%%iu;m1-%ne9Bvd$G50T~drOf51qy60{sJB^oPoD`Gt&S7002ovPDHLkV1i?G
Bmq`Es

diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_advanced.png b/app/src/main/res/drawable-xhdpi/ic_menu_advanced.png
deleted file mode 100644
index dc15c1002c2e005b5a9ca261892792e4a539be53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 992
zcmV<610Vc}P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B0Nkl<ZcwX&U
z-)j>=5H3Ox`XGoPK`4R*L4^G1UD_f?AqZ6pB9>4TAC$iN0}=XG0!{IyP)eW_#Q)as
zyUaAhbg$kemnPtSFkHGbyE`*GJF~l8S*cK=LWK&;h~aQ}r`zq;L2HKUZ1=KDhbW46
z;y50G{sd^WzP|p-_gNZ1xpx7juMy<-eBXtm)9E}i3jS=hTF-3=@o%ioA^G_JZZ?|_
z{TK@c4A@rXHa9o#c|HN&D*2S7yyxE<Ha0dM(Bn|1rfm!hG2qO~dVqf}E7jLFZf=gp
zajk6W*xK591_e$`JdY3_`<VQtQS7_#XF<LgdJgJ|;a8g;Z37tc)c2bi9265=8s$TD
z31c4nz7{a}NuF^i=lf0#h6+4&%)!NTiLAy~(1o-Q*yj6&AkH{aWij?=P@~;$ztENB
zN|#nQ7$WK&c&2N4oW$;hB49tSB*)jez~8aFslbe)US@jq{COafbPF2c_p0X?0vz(j
zcz@0F=K;xZX}ab7o?i&+4SauiUKV7d9-z;e^krNh6mbCOlfH+ZR|skV!snakg#g)I
z^`0kb-}QY$D9r#3Ax;kJdA<d+h*6liy)PBIud6|#obPJ^*~G}c_54DJ#^wK12gFKz
z^fClwY9?fUB}sDM^7%L0)i|Gh6fpR`&c%7NjwOY_gBJ!H=)j>$3B#Jo&niNa|5c{#
z`8@C$<p-r6_{77y5?ALK1=@DiyPjteO;Yk}&qLe3D9>U!Rc*<H7?4&;PUQJiD31Z;
zi`=!%Yz#Op)c_wtTxu`FkWhXo#0W{Rx|f=sZ$qrK5RyuKwTVF=ybQrjsov#gy=fEU
zdzR&4CJAE%S7NqG%rs^OOg!Jhrco*xkJD$5Up0=DBaQZ=MOEUsq(T-??hUgQGBqG?
zB_?=eh{s0>JsNX0c$5gH*AVEiQVg(_n1?LSp9jPN>8h0xLaXs)bI#_CoZzut3>cMC
ziA|0#^+MBVH17H%1;^L9c#*QasUb?HmwCoDvk0$%`28uK+;5Mv^1p{%N7K53?*-_K
zv?aQ4F#hqhjtN4FkSd!+|GbRz(w}FXyv`^D4yv9L;#=olG|t<FpH&zla(uAQDkpPM
z-a;R?Z2ZRKVwI*$E9*f%<!HERtKG`O)=jWai%~}Tmt)D|pB6)q17E5fzK5a5U6US}
z&FX%Pg@a+C3f@FEe3lMUGcy0d5tZ>+HE(cpGo)+?F=Twvs!*ZAe~!QEjtKQppLUS|
O0000<MNUMnLSTZ4?%zWI

diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_change_server.png b/app/src/main/res/drawable-xhdpi/ic_menu_change_server.png
deleted file mode 100644
index abc46db37d04d8d6ba91bde0297cdf0b85054de9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008UNkl<ZcwX&T
z{byW36pfN!R+K6gAxeKJvFz7-yKmJh6{?mfDWyUip`st66;Ud5qg06qYl;51Jtw(S
z<8(LPdh^~U%;B1SbMMUDb7$tx%q}fOL_|bHL_|bfqTlatWLb7s>u&{;BpIY>`lr+B
z9I0+0sMqT&y<YDz9Lrj*))SWeX1&@H-EMb_1Yq||b(H~w*AT%MD39sPHS(Qy{&HC;
z0Svl~D8GaQlPS(#C$xXX_6sA>ZnxJk=!tU*zb_EoFR0&yQ|nwZbdV+L9^&^i*nRbh
z&}o!=l@nmrz<^`t2ps>^Xfz(E-87Im?Du^ll@efdJ?AIfsA@9}aQrEkixZIeQ8@uF
z37hsy=bO!DU2Ud;Sx6(UQV9V>?X@>xNA<G++ZyB>ot!1iPTDRgnEDuXBe19X8xKTi
z+bx}2dF*>@zm(`RD9P19xUagxVCr*g9~q>j`Ve43@WxnGeIXz+nd^Mkou()TgTXzI
zKv(sJzzo5TL1e7DkYN8d&U4ijLRI$_^nYeEu%)^}K&L|^aHhJDa5E76Oi1j}VI-DS
z9|GK4-WZwc3jtI5$aT(Zf$Bp*ve3Hf3t==G-9g9a>^$%NXI`N1H%8!`<Eg$dc+hYr
zv_1s5EM0)``<?1<JnU6h&hk<4;bQmsZQf3Ofdg+@KhH+zYb~`)BHDdWeQ;oqLl>=C
zk~fPWA>8NLVr|C!R-52Z0{H$7Iriir&u!IScJ6}6+}}`}QlJDN6F%hgE*sj})nwxO
zV0*PI4UPcHpS~0LKILZQn$|SPZ`RxXIQ7XVbG+<=z$5UH*Iqbv<T>QXj3Fnsr1;m%
zKcb$^Veo5n9$?@DN5IwbjbQcvIVw(Hp!{6cX`TyoTnTu(8p%LE#LVnKcGIg9cE}T)
xdTmoV;NW|UX!xgJ6|l{?%Tjd_5fKr&@fQc^T>AhmR~Y~R002ovPDHLkV1h*ta`FHG

diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_docs.png b/app/src/main/res/drawable-xhdpi/ic_menu_docs.png
deleted file mode 100644
index 0ef79f457da9f9638c2e3974e1097f8465eba481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 959
zcmV;w13>(VP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AqNkl<ZcwX(9
z-%C|N5XU3vMIwk^B#0m)i2I<PJx3)jfe6xz^k4+OR7fIOh$4}Mki7|V5#)mS-}e3L
z%yk^EHs^;|AI=AsgLh_jXJ=>k%vtZ<YiVg|X}PO(I-Q48Q&UfiqIkyV%*@OquXCrE
zo}PY^Qd-FKd<*Rm?Zh|8duSV3mc66C@8ed0Bd_4lCLBBV4*##g<{MYY_c;=nB5-2G
zIdqJ+Jvlk~9#70Gdr1f7S;+6((Cs_BuOm${MjeCh8wU>H-y$dFb%#McrV;H-AN#Yj
zv#-5w<1mmKK}nkrc#e6!2(Wtq`(=}UefID58e?K&qGJX-Y${^x2mSUmC>+P@)CQ3m
zH<4$`jC-9rus=;HJdYafpG%FlYnC~5axmAa8{HdtUpzNK+TGjRyYF=>fsW_J`4gNZ
zZ@k>Y69t=e&7>RKTDRMM>~%ftUu|H&;N_)}=xcs%d$~vS{~E^!4U_sqxwr9f9I-h}
z6%U93Hu{m&!GLqd;g7I+!KeO){@!{U4{gjU%z1e!(7`Wp=BJkp1B0*1;J@wf{9A&s
zYJa~9vkDjbDFt&@BN54c0^Mb?S#rOZngCZy$Byisp&$yGc2cJJV)dyf2y-4z4^k+a
z5*$x$U|)E72-Yq#XwS<c$cElfN1~fpN%CHxA6^zBmtu|kz{?`o0|3r{FI%u-+#MPJ
zvzLW{;kr2R!^<M@T_Dbf4ge3wl?kkSS%|t5Q2VM5)Sdt$_oYq>nE<SLSp-cXv=uK4
zVK(uBmqm~&bEj%`nWO@!yoq^yNd!tAqfKCsQA{NB@(}h#7AXNdd>8PYkV+h#3T(PM
zcI6it$>j~20)?E1HdSqTa*1uF{Wl<);*3R>mtTc^^q<<XMZXCMi$=5Z^Il#GOkgaR
zd!Dk9gv}?kKC4kLyAHE*2UXJV66x&1>NFzJqOL0TgQj-$6>i34J}LR>=XIJuQl~G`
z-)$uNN^$nleWXjvzr9W!q<_69;&*qW{hwm5Rq*UJd99M4@3Wh^R#A$}7hB6!mpYvt
z5K9^qiTur7Y$;MAT)0}~Rblj~l<Ss7lQQgMpI4S%_r_pt&(A}3KvyKm<u1z*d%26>
zGrin35!bd7oqXfa!E|1Ah8rh=iEWNF>es>Ii)jSMHj-44LmD^g7UT<~E)Gk>6tn+g
hy0sK(X=%B;`~v_Ky3)_#@c{q;002ovPDHLkV1mXS$zK2f

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_about.png b/app/src/main/res/drawable-xxhdpi/ic_menu_about.png
deleted file mode 100644
index 5837beb02353c5144bf5bbc4c236cc9da6d28850..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1673
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
TZ>pSy00000NkvXXu0mjfHasQr

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_advanced.png b/app/src/main/res/drawable-xxhdpi/ic_menu_advanced.png
deleted file mode 100644
index b7ad9ff31fbb16e71fad00ac14297feed66b317b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1985
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
TKTSE)00000NkvXXu0mjf{MWwK

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_change_server.png b/app/src/main/res/drawable-xxhdpi/ic_menu_change_server.png
deleted file mode 100644
index 4c9918991ec1486e88c15ef6d7ccf87bb731e2e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1455
zcmV;g1yK5lP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000GcNkl<ZcwX&W
z3r`hC6b2)yLEBWtR#O`rMNtW_oeNxAVy@Asi7(=Vh_*#z6-#0tp`sX!SE;s&VpI_M
zw|<{9dovvF;@*34XBXy6PIkF-cK6IT=bU*`SLfm3;o;%o;o;%o;o;%o;o*^H6bgk6
z?d|Q~KsL&<H4l;!1i>k#)I@i8_h4^t?^jZ1O#`It205>Dx!eNec~4JIht$a=5EkoO
zT3WtD<(fJ=I=(|izo)<>cH+9dudi<lLkFt$@>v@oWS=32@~X45^GB(Z85E1fb*wz3
z8^l~hg+>q_cX0n0@|1$#p5Qu(-~WRAjQeAd{msqIU&!|ntA-#Z(XOtpUs36YsPIdx
zQlFApL*AdbFUUlkX@VF=Y<<WmWUfr*D;5wu0|z|H5X2|yGfPl^fB$9^9@Dat6r~gE
zeaHyzFXMUvl|P5;C0wtX5POEQ`7+PWu^iVRlLVow{T3CtfeO446`O}lK?dkq)MKJ%
zexbK9N8$GdNFxbGNbbUYFW)6eGVhy4*<fY}Vg>X0{10q-Q5oiudyqB~A)ku__H=m9
z5Z?W-Bq}Qeear_S;el;5TN&32Ow#g!N<r`9H;{w=p*LoVAQ;>P1OK)SXF^4o95myZ
ziou+O_l=d2rzm@$8G=l2^@l~wdv@nAcCXZp3%oBVL%^pbodnS++fb5&oYBghBz5DW
z8iJVnAno#9PQl!g)7^E+P>z&qA%|ek7U+@mWL$y%@oK~Qvw)!mE>0^m2vj=%3`xB;
z3(l+9a-rw&o?{oOw`KuSellJYj&4s?JI+~^05RiM?kRGqLh2+5HV!;EhsK(K{6-I#
zI*EZRcWUuef^(_{sh1=$h};Sr#=?Av-u0|AkA?wl7CAKNu+&K!N)J{`UX8y;oh`xQ
z;{!H9oOnu|qyd{6kq57ZHgP<L-*!m7L;wSRv07@*nJZi1*o$EmPD5bVw6k7S=@q_^
zpck^-6}Xtj1~VS?7WaFkP9g}Cp&@8emb(J%DJZM+;Ot-OBm$ctNKux%0z&Et?3r~=
z5Dd8;8o^1TEO!OY$Iy81jAy@b8Dhhh2Q8!_Nt<OCZYPCyJ#jX8MN6Hq3F4-o)JYm#
z--cZymS^90HvHgvk4+GyAa#<4oIK<28?CLao1|VMP<r>F)LY>Gq|`|o+?Nl#cwFZ>
zd9HO`swODC@5SD1WF;2mYX$AF8ti|1xztG%Op2T!GWKOz(%_b~?a>hCA2;)`w81RT
zUa@l`h9P}YFEubbq>bf-Nt65PE7iK@#0XD|l(x8WKNWQv#2GM2{2Im$F(;Xgy}J>@
z#Vjtck8?Mq*6|ZOWgEX2PEd{a9Fcm?L2_&tk0T)JF}IZEyW+wu+LiX>l<v81u9SDK
zDC_}RT%ku*+xwZ-!$qTc{QUrSG)vu70ES(a1W-6nV=GHR+4X!rf1sKW!}B{Jqd99*
zN~v|T^0Oj}AXH?IEzO0iYRIrq&(Ohl@{k$vjh89~OTNn@iXf{JQ`}^%hA0xlgifzf
zOV1qrhj$)IU9Tl!6U4B}>60Fdj@=n=;(^UkdIG!qsE|<Rs0*Gu&mK>Djrq=u(ntK9
z?xw_oO%M!z#Di2yA3!Lo@@IKUWGdbDhq;Nw@)TO+nMRaNLx!tO@J=8J3YR~)9)q$$
zrH}Y7scePv3h((H@9xC4QQDAdC~Kk0CWv5u;NK`aqx4CPNbiV{Sso!KF{vEm#6h4>
zsFo#2f}sJO!-3wzVn{K>!ecBG%sIH;3iR@6<RS7*p%Q{5I6vdSFI*Wgge?0n2$=(0
zJ0vJ@xucm@aP1eQ+%{oyOqP4p>Ai7=iTvHe!^6YF!^0yb_yBX(6c0SsrG)?h002ov
JPDHLkV1mS+w%7mw

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_docs.png b/app/src/main/res/drawable-xxhdpi/ic_menu_docs.png
deleted file mode 100644
index 6862e799c659c7c5dbc4d8050c19399ed8e7bd0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1855
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

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_about.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_about.png
deleted file mode 100644
index f8497e6326d70546af102939b3a85ddac54fe8be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1361
zcmV-X1+MyuP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000FTNkl<ZcwX(C
zu~Oqe42G#`ufCS{02^lRT54KauH{<V)U>I2+uJ{AGe(vY$FZbMqHktrGG^`7N?J*~
z4!OEYk|arzBuSDaNs=T<k|arzMC0-C@yEl%!_U%g3x9?U*UH~-(1+ib%%JPKYbf^q
z{{E$WUiE#yF70z-TbFy@aW5GrjWPu&{qFAW3Ca_cdQ`(R%d>x{F$54gih|zy!@PWU
zD`UN;A+ENHU)<ZLwu?0cLQRRyFI*ve8shpJlveJ2MyRR@7@u(se<On)w305$5J-v>
z6$FL9Lcw#CgL^26|1Hn?5T4JC@PQn`pK~@$^?G<Pg{Eu%jAMY|r-VDmxb)cJz#F@-
zQgSrmf#MMcZuq@R16i;t`1nkgk2$NZNl5u>2&f*<@3UrtT&HgY>{@$0-mj57`90o1
zhFvmZ4*Z^z0N$fbtTpf2vl`Yd$vTN$6GF)88ccGKsr%XtN-{U)Fgu}%h{{Lu<NaGh
zOVDLbs}>z+gjQ;vg7Pbx5imF2w<)mk;X;%5yz#!RgHXxmK}NXceVagw`?z)zOP8@D
zlwyb8-h7m0dwLbb0Iia1E)<cVT=}0Z)cMCk`-IWlA~ugIQu&7E%lj<_LIABec<1KO
z&N3`W`2g2=zYsL<w+uZ}xU*CUyq%9nbBtdFiZWh#zopO&P73ihdTe#4DZ^3`biOni
z6V3A6Mp*^16_Hf;TZV!PCN7L?mUAjnE(k3&B!P;j{NnwV2A&Ru55{#lwUkzYhr@|T
z;m5-ZD;OWUQmjI+Fo1DjY+>Fm<9~zR?Q%iPl5Z<W$rw(+`<a7popC|V`lU7@<vr+v
z_cKR{|7O)sD=49N#rv7lk7MDQ_pt<ufajrk8$NpOnisfL0~mi;1>v)2BJ6~t7gr}x
z$}zVDEENEriBL+!9%b+rNde{BGw)}Gln6ZyfVuMVJ@!9aBn5cx2&M5o4Imv+dyXHj
zfJ+}gT!2d-Ulbrikl*;3grk$NbSCdvhDIAeDnn74^L}P18?k@9pB2#tXyO>A58RGN
z8z6G-TW|oymEh$Ckp@s!zuPg)7U?+JO9_z%kj4%<j+O-RO2pFGUItJSuwMmK!RaFx
zq<8w3K%@aMM?SV!=pCU{1LoyelmVpuPe}Z)NIOCgfual`Ib7&#SPDbZk~Ccf5eAT|
zADU}S_^C*5hpdxvgaM@FYdz0NNN>l`ELVZI0h;yxiWD0ybAh)3I^jQMn(+RLwhF9{
zs3ikf)#6g2LF2XI{S|3vT$;(hC?WX|y%L{!pCzEsGb%Eg^8Sie5kWcl8}GjamfsEK
zMjp<`!l@QP+NhAwX8FL1PN?qCLhJr1D50p$Wvc*Lx%_A$hi->LOLufseJV!Kly4bI
z7Y8v?ik~zQ{O((G6CuYLmD5%E&BlEVt%7KALc1IWb7)D{gP@o9q7iW2YM*cjXZwRq
zl|9}Swi>W`)Iv_ATqf)@0!`TEw>zPD>0ph?vht9{6(l*WL}inI$9{s}e+(FVpU2k*
z8PT6V<7}Xv>(13cZSxxt*!axxM%+VVp{&$m{I~IzHhi-{Is3wZ&^A9w4~62Zfk>WE
zFd9DN8vfSJ_!024_j-+)hFGk@pa@M|u8YIj5St$XPsIxi;`ZKTd1%8k5vndS)XV|K
zKvJam41*jJ*Wu+W+-r4QeUZQ@2p#o3z_8&OcCB+NrX)#{BuSDaNs=T<k~8K%Pae`2
TCYzQo00000NkvXXu0mjfuOo?G

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_advanced.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_advanced.png
deleted file mode 100644
index 36c1fa69e4ca49f5bd9de25803060ee7a00505af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
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

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_change_server.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_change_server.png
deleted file mode 100644
index d6187ca1c7501e4101c9e46eb510931e9c4c26fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1115
zcmV-h1f=_kP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000CcNkl<ZcwX(C
zF;C<$5QV8}scC6%Aq&!7d+pKE?zMX@?bfuZ`M2jM94S1;>m<aH$NN5M1Z-xLc;0yI
zI0;u*LI@#*5JCtcgb+dqA%qY@2qA<JTXKJY|GVqDL-_fVw~4|$K0dze_xtz3B*Mmw
zgAWTm;UD{mf*1n4vd_g5f^q%y^mK<B{qXSc68=6SKx9X3gAaW19p2A5BmfbDcoPEp
z2Z7+=Of`Hr3Ub5yXRPnC&qWZkcX7~D7R5*otd>9fG)<U=>_Vg8I1p<aj$sL5_+5qo
zC=VqvK4;;Wr*UaAwzn?;>T_sp&y6>%AL==JO0e4~+%*ip<FmN!ISM*uzwa1la4!6L
z(*nf69k|hC2>Nl!jAj6WgaH3F_WjBDA`I5705SL{Zt%$Zn8k~NZV_ix2=b&}0c%o#
zST>RaEgC&#%D9v$M7BpXDL^Lkd(?OSPAPV~-7g%|IFF_UIC3LnL*LfU`Yu1dWUVOy
zFw@`$#zw9l{FvQejy2bs5dZ<^#>ED%9(*vh#^<aV0jxo{RPX_&t$e&Cw&j>qj8r+m
z{G5H)1jj`NFSRCu4>}|JF&}3?Q2;CZAxNpxBM2+|tyM@-0BazGAnYd!VNC@+4s7u;
zl~ebzDCnnjTII)81FpV~VQzYGqWrkKsIhu6?m4hub;O%2eB#gSS35XoZikC9ih9W>
zj$XljwS$XAZbxX_f&Hoj<;FPi)o!kAg|&v|qLdl~aL+zoz`2tE^$)~G*3^H}30x+V
zAwd1zHUX{yxIOGs9el#h1>hdwQh*ctc)_ax{syiDF5BWVYYZ@T=61L!r=5Kv=4u@X
zB$ia_e`_W_f%fUdv9QH{wc~b4#qA|Lk?6_wFR8e#oy6XFat>`{zbZk%$0zRXRwUmG
zaG6B$(U60SZcA_ic}ya=SgW8gk25)!Sc9*}NrX$R+TU#Uqft4F?}FWJF^=GPopBZ4
zO!iyvVa+iFr(`Btr3Y5>n46L6+H<Wdv=oqff5F9-?-Z;@JeF9Axp*r0o#SQnFIbOw
zEU~rc;%9<iwA^jZ1Of0)@Zp@TIS_XrFASPBALil#tT{{&V6&`)kT@0}e=v_Lw^^nL
zFcJdUzPb?DXKpNNGWcMQ0E0n@HA(?8J{S04{hB4NIxGR=qu<F=Fc^GrlP8vr>~b)C
zV$kuQwI=PqM31WqOMtjqdTrf7J7?X;^ZKvoA!PV08}PA3k+Pz?CndmW`|aG|ea9eH
z(<O(=2`~_QMKK{RF7N}^QiLVIz%X#GBt}1sA$**RVXgpU5IFQ8WG{lr`(cA<!HyW@
zFFNRBz9WDIW-SQrU~$>{<{}2vC9Exgm<h6!1qh%0U_ViiZuG1@e&_9C1BRN-p9>*`
h5JCtcgb<=-{sRrV+;C>HW=a46002ovPDHLkV1i*n2zUSh

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_docs.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_docs.png
deleted file mode 100644
index f0ae1d5c322bf8d7323acc2992c22f1eea0f349c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1494
zcmV;{1u6Q8P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000G@Nkl<ZcwX(C
zJyRSp42G#`Q>Ud(U>9bRmNsc=NlRMVt7)&!zm4C+%PhKA`-NotI6X6-VHU3~OR^;U
zZtmhD2!bF8f*=TjAP9mW2!bF80*$-7yDzu5w_j8Hp7=R#c$WTug+B7VU;|y(T|%)p
zH#ZOI?_J;b`_%p|Z2R=iGv3XH38O3lO259ozK8ONQa{u%W*YlP7=wV&kredQuk-TF
zEzR{9hPZfByt%h8ZD(r;gqjqaAEZKN8shpBl$PH8jZiftVEm0|_+K{Ys-1LJhCotW
zs30i(5enX-9K4g0_@6Y+3mIP;;RQKDj`L|)>h<v89GWiW7#{(KUlQ&hqxIa?fj4%q
zrR33qM~X)nxRUQ$16i;u<orUGmo2-lNwV_Q5HNVWe9xN&a-F^raBA)Kc)v&Tl<$-V
zGEB*cHOO~P0(g(Mu-3e5W;g6xl64VN3qr{08ccGKse3&PGMSrlm`U<NsPd8gWdGLC
z5_DSAu0_W=LMt^-LHPrk5wJGdw<&P&kwRzhd6Iow2cc4~BOBqn?Arud+{ZKPt&8zc
zx(-(n_}gO+wx0g=gl;;Q3CgxLtsq8+D6P6Oz0=Vux#mJq7W7CVmUTYvX_zudGd*AA
zbAp`XA9kJWTMfi`DIm75?6(z72~*ATVvXekJd^#Zpn1PlDA2;df@T)};O%7mHg*Av
z{fNb~-&WZ8c@BKUct7<Krnel}`LbV8yuBaQh8!CWAHK-GcqaSxh82sl3(Usf1grZk
zV<TJi)c9;CScVBUzGcE+4HGCW_?zsv6=vY61+!$0F=W53taS)iSorA-D<8lNFlAtG
z1LTl+R1j1NL;15^DTrCp16UZ0IvRh{z{-v^3qgP-V@o412H!f9f>_qxV_<A7a>~<^
zJinwoXjAWOf$d7@LiTe<@ivp{XAPK>$&!_Cx+8%SdUvv)JN<Di+{-@RWaYC9vx7Wd
z4pDvWiWd~E24<A+8kakA_2Ol0ic*f5Z}%x!GR$r7seHiZF8bj;tAN<))C;x)(Xb0k
zcp^J>PnE~!uu5R+fMgAG0E7kE&kOJK#w^SLB?UP5`Kt?X?(<UtN`@dde@O*Y4?!#j
zmrTO74NyG^qvVnTlq^G;0ZJ->m7&&mPLr@QFd5*l?B_*CF6l~?p93g&<@!s`f1s~?
z9LIuj35HgB@wL}}02ffzy`Tch?k{=`bAVk(mrR7UVEL!Ybu<&CWFoGGl7Nd90B;}>
zN<sR9-x9z)Z~~OXB|{(9DA!$b{&y(VfO|QX%iuRfpb9E+8_CW;RpS2uI}w%;Xk3Dh
zntLU}9M0=w*hS<p#I~f{E?|eip?U5CR{i9))(JlY9r<*~GZ|}&@Ky#(zMkt`47^<m
zmX+bQ3s@-dREB1BPlK;QQHWbEK<LXJiSV~a9gb(RpA{_Ucp7{)+Ab)0MePMEG|-yy
z{sDF}?j64xQi2?Mj*5(?ynjHeh_HP<!-E%)SqVKwZ(diy4k}q_w|wA5N2)uts&)So
zlu*>>wpD<vQhu~5mu_pxTleUy`c#adDgUHGDPkmxpLrqp-M8izk{#!$oF0_lY~0t-
zDu@;rH03Z@Lrb!*Lf%@+g|%=_$aTIdqv!on5oWxr+HSz%Q42XW<#J)p2zkM#zw@90
z#j}ewA<M3WEJZ<*(@Ipa_-C9a<oh21bI*DF(7f-Js)LUa=XOJGhaYam!Dov%;+;Gf
z%1SN9znjn6@XZ3{%!L8c4nIi`h2pD$NS;tI8ve#J{IA>aBjBIj>oqnS!mPod2u)J1
zv!k#f4nG1OiYJWX_H43T+b||V)mes`Ex;H^ia9>RAZy|}ynKguvq3}Y7QiS79Wcz0
wfQN=>IJIu6n1Ub(f*=TjAP9mW2tG0Y0kz~cH9O}edjJ3c07*qoM6N<$f-xD%e*gdg

diff --git a/app/src/main/res/drawable/ic_menu_about.xml b/app/src/main/res/drawable/ic_menu_about.xml
new file mode 100644
index 00000000..8f674e76
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_about.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "info" outlined icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_advanced.xml b/app/src/main/res/drawable/ic_menu_advanced.xml
new file mode 100644
index 00000000..37563dd5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_advanced.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "settings" outlined icon with hollow center -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73s-0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_change_server.xml b/app/src/main/res/drawable/ic_menu_change_server.xml
new file mode 100644
index 00000000..b0bc26ea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_change_server.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "dns" outlined icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19,15v4H5v-4h14m2,-2H3v8h18v-8zM19,3v4H5V3h14m2,-2H3v8h18V1zM7,8.5c0.83,0 1.5,-0.67 1.5,-1.5S7.83,5.5 7,5.5 5.5,6.17 5.5,7 6.17,8.5 7,8.5zM7,18.5c0.83,0 1.5,-0.67 1.5,-1.5s-0.67,-1.5 -1.5,-1.5 -1.5,0.67 -1.5,1.5 0.67,1.5 1.5,1.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_docs.xml b/app/src/main/res/drawable/ic_menu_docs.xml
new file mode 100644
index 00000000..7173201c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_docs.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "help_outline" icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
+</vector>

From 84e46def2fd0a1aaa542994fff232a8963fb916c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Tue, 14 Apr 2026 20:00:08 +0200
Subject: [PATCH 5/6] Add error logging to EngineRunner.debugBundle

Wrap goClient call with try-catch to log errors, matching the
pattern used by selectRoute and deselectRoute.
---
 .../src/main/java/io/netbird/client/tool/EngineRunner.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tool/src/main/java/io/netbird/client/tool/EngineRunner.java b/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
index d25334f0..dfdbf846 100644
--- a/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
+++ b/tool/src/main/java/io/netbird/client/tool/EngineRunner.java
@@ -219,7 +219,12 @@ public String debugBundle(boolean anonymize) throws Exception {
         String statePath = profileManager.getActiveStateFilePath();
         String cacheDir = context.getCacheDir().getAbsolutePath();
         var platformFiles = new AndroidPlatformFiles(configPath, statePath, cacheDir);
-        return goClient.debugBundle(platformFiles, anonymize);
+        try {
+            return goClient.debugBundle(platformFiles, anonymize);
+        } catch (Exception e) {
+            Log.e(LOGTAG, "goClient error", e);
+            throw e;
+        }
     }
 
     public void selectRoute(String route) throws Exception {

From 84ca3921f30f19fe35d53b8ab76e8ff2f22c37c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Tue, 14 Apr 2026 20:04:11 +0200
Subject: [PATCH 6/6] Guard TroubleshootFragment UI callbacks against destroyed
 view

Check binding and isAdded() before accessing UI in background
thread callbacks to prevent NPE if the fragment is destroyed
while the debug bundle upload is in progress.
---
 .../io/netbird/client/ui/troubleshoot/TroubleshootFragment.java | 2 ++
 netbird                                                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java b/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java
index a3f6aae9..7d6fffe6 100644
--- a/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java
+++ b/app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java
@@ -72,6 +72,7 @@ private void generateDebugBundle() {
             try {
                 String key = ((ServiceAccessor) activity).debugBundle(anonymize);
                 activity.runOnUiThread(() -> {
+                    if (binding == null || !isAdded()) return;
                     binding.buttonDebugBundle.setEnabled(true);
                     ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
                     ClipData clip = ClipData.newPlainText("Debug bundle key", key);
@@ -81,6 +82,7 @@ private void generateDebugBundle() {
             } catch (Exception e) {
                 Log.e(LOGTAG, "failed to create debug bundle", e);
                 activity.runOnUiThread(() -> {
+                    if (binding == null || !isAdded()) return;
                     binding.buttonDebugBundle.setEnabled(true);
                     Toast.makeText(activity, "Failed to create debug bundle: " + e.getMessage(), Toast.LENGTH_LONG).show();
                 });
diff --git a/netbird b/netbird
index a35ecf9a..f01c1eea 160000
--- a/netbird
+++ b/netbird
@@ -1 +1 @@
-Subproject commit a35ecf9aa8d8867df5f13a98840e152aa2cda0b4
+Subproject commit f01c1eea6ac803fff4678abe93f95b4c965e372b