diff --git a/.gitignore b/.gitignore
index a7f979b3047e..346c35486bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 # Gradle
 .gradle
 build
+app/build
 /local.properties
 /captures
 
@@ -15,6 +16,5 @@ build
 TrebleApp.apk
 
 # Sdk
-/sdk/platform-tools/
-/sdk/platforms/
-/sdk/build-tools/
+sdk
+sdk/.knownPackages
diff --git a/app/src/main/java/me/phh/treble/app/MiscSettings.kt b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
index 819df0ecb9c0..e70c0be3280c 100644
--- a/app/src/main/java/me/phh/treble/app/MiscSettings.kt
+++ b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
@@ -4,6 +4,7 @@ import android.app.AlertDialog
 import android.app.Application
 import android.hardware.display.DisplayManager
 import android.os.Bundle
+import android.os.SystemProperties
 import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.Preference
@@ -37,6 +38,7 @@ object MiscSettings : Settings {
     val aod = "key_misc_aod"
     val dt2w = "key_misc_dt2w"
     val restartSystemUI = "key_misc_restart_systemui"
+    val dumpLogs = "key_misc_dump_logs"
 
     override fun enabled() = true
 }
@@ -129,17 +131,13 @@ class MiscSettingsFragment : SettingsFragment() {
 
         val restartSystemUIPref = findPreference<Preference>(MiscSettings.restartSystemUI)
         restartSystemUIPref!!.setOnPreferenceClickListener {
-            var cmds = listOf(
-                "/sbin/su -c /system/bin/killall com.android.systemui",
-                "/system/xbin/su -c /system/bin/killall com.android.systemui",
-                "/system/xbin/phh-su -c /system/bin/killall com.android.systemui",
-                "/sbin/su 0 /system/bin/killall com.android.systemui",
-                "/system/xbin/su 0 /system/bin/killall com.android.systemui",
-                "/system/xbin/phh-su 0 /system/bin/killall com.android.systemui"
-            )
-            for (cmd in cmds) {
-                Runtime.getRuntime().exec(cmd).waitFor()
-            }
+            SystemProperties.set("sys.phh.restart_sysui", "true")
+            return@setOnPreferenceClickListener true
+        }
+
+        val dumpLogsPref = findPreference<Preference>(MiscSettings.dumpLogs)
+        dumpLogsPref!!.setOnPreferenceClickListener {
+            SystemProperties.set("sys.phh.dump_logs", "true")
             return@setOnPreferenceClickListener true
         }
     }
diff --git a/app/src/main/res/xml/pref_misc.xml b/app/src/main/res/xml/pref_misc.xml
index e5ac34e3baac..f201f146cbb4 100644
--- a/app/src/main/res/xml/pref_misc.xml
+++ b/app/src/main/res/xml/pref_misc.xml
@@ -151,6 +151,10 @@
                 android:targetPackage="me.phh.treble.app"
                 android:targetClass="me.phh.treble.app.DebugSensors" />
         </Preference>
+        <Preference
+            android:key="key_misc_dump_logs"
+            android:title="Dump system logs"
+            android:summary="Logs will be stored in the file /sdcard/logs.txt" />
 		<CheckBoxPreference
             android:defaultValue="false"
             android:key="key_misc_remotectl"