diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
index 9c7767ade2..4df197aa94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.components.settings.app.help
 
-import android.view.MenuItem
 import androidx.navigation.Navigation
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.R
@@ -10,16 +9,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
 
-class HelpSettingsFragment : DSLSettingsFragment(R.string.preferences__help, R.menu.help_settings) {
-
-  override fun onOptionsItemSelected(item: MenuItem): Boolean {
-    return if (item.itemId == R.id.action_submit_debug_log) {
-      Navigation.findNavController(requireView()).navigate(R.id.action_helpSettingsFragment_to_submitDebugLogActivity)
-      true
-    } else {
-      false
-    }
-  }
+class HelpSettingsFragment : DSLSettingsFragment(R.string.preferences__help) {
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
     adapter.submitList(getConfiguration().toMappingModelList())
@@ -46,6 +36,13 @@ class HelpSettingsFragment : DSLSettingsFragment(R.string.preferences__help, R.m
         summary = DSLSettingsText.from(BuildConfig.VERSION_NAME)
       )
 
+      clickPref(
+        title = DSLSettingsText.from(R.string.HelpSettingsFragment__debug_log),
+        onClick = {
+          Navigation.findNavController(requireView()).navigate(R.id.action_helpSettingsFragment_to_submitDebugLogActivity)
+        }
+      )
+
       externalLinkPref(
         title = DSLSettingsText.from(R.string.HelpSettingsFragment__terms_amp_privacy_policy),
         linkId = R.string.terms_and_privacy_policy_url
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
index e9a67542cf..fa79a0a7e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
@@ -58,7 +58,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
     dynamicTheme.onCreate(this);
     setContentView(R.layout.submit_debug_log_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__log_submit);
+    getSupportActionBar().setTitle(R.string.HelpSettingsFragment__debug_log);
 
     initView();
     initViewModel();
diff --git a/app/src/main/res/layout/submit_debug_log_activity.xml b/app/src/main/res/layout/submit_debug_log_activity.xml
index 878f4bbf16..8e8c161609 100644
--- a/app/src/main/res/layout/submit_debug_log_activity.xml
+++ b/app/src/main/res/layout/submit_debug_log_activity.xml
@@ -11,7 +11,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:padding="8dp"
-      android:text="@string/log_submit_activity__this_log_will_be_posted_online"
+      android:text="@string/SubmitDebugLogActivity_this_log_will_be_posted_publicly_online"
       android:textColor="@color/core_black"
       android:background="@color/core_yellow"
       android:visibility="gone"
diff --git a/app/src/main/res/menu/help_settings.xml b/app/src/main/res/menu/help_settings.xml
deleted file mode 100644
index 32cdd53302..0000000000
--- a/app/src/main/res/menu/help_settings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/preferences__submit_debug_log" android:id="@+id/action_submit_debug_log" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5defb734f8..1ba9285fd0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1580,6 +1580,7 @@
     <string name="SubmitDebugLogActivity_success">Success!</string>
     <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copy this URL and add it to your issue report or support email:\n\n<b>%1$s</b></string>
     <string name="SubmitDebugLogActivity_share">Share</string>
+    <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online">This log will be posted publicly online for contributors to view. You may examine and edit it before uploading.</string>
 
     <!-- SupportEmailUtil -->
     <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string>
@@ -3425,6 +3426,7 @@
     <string name="HelpSettingsFragment__support_center">Support center</string>
     <string name="HelpSettingsFragment__contact_us">Contact us</string>
     <string name="HelpSettingsFragment__version">Version</string>
+    <string name="HelpSettingsFragment__debug_log">Debug log</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Terms &amp; Privacy Policy</string>
     <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
     <string name="HelpFragment__licenced_under_the_gplv3">Licensed under the GPLv3</string>