diff --git a/app/src/main/res/values/string-not_translatable.xml b/app/src/main/res/values/string-not_translatable.xml
index 9506405f96..d24f2cfd61 100644
--- a/app/src/main/res/values/string-not_translatable.xml
+++ b/app/src/main/res/values/string-not_translatable.xml
@@ -12,9 +12,9 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="app_name_real" translatable="false">Markor</string>
     <string name="app_name" translatable="false">@string/app_name_real</string>
     <string name="app_license_name" translatable="false">Apache 2.0</string>
-    <string name="app_community_url" translatable="false">https://github.com/gsantner/markor/discussions</string>
-    <string name="app_bugreport_url" translatable="false">https://github.com/gsantner/markor/issues/new/choose</string>
-    <string name="app_translate_url" translatable="false">https://crowdin.com/project/markor/invite?h=a30c38972fb7edee1b157e38bdc063492042484</string>
+    <string name="app_community_url" translatable="false">https://github.com/gsantner/markor/discussions/2269#discussion_bucket</string>
+    <string name="app_bugreport_url" translatable="false">https://github.com/gsantner/markor/discussions/2269#discussion_bucket</string>
+    <string name="app_translate_url" translatable="false">https://github.com/gsantner/markor/discussions/2269#discussion_bucket</string>
 
     <string name="app_web_url" translatable="false">https://github.com/gsantner/markor</string>
     <string name="sync_client_support_issue_url" translatable="false">https://github.com/gsantner/markor/discussions/1381</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14ab36a2db..54c8a6b9d1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -232,6 +232,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="translate">Translate</string>
     <string name="more_info_and_help">More info and help</string>
     <string name="report_bugs">Report bugs</string>
+    <string name="do_you_have_a_question_or_problem">Do you have a question or a problem?</string>
 
 
     <string name="join_community">Join the Community</string>
diff --git a/app/src/main/res/xml/prefactions__more_information.xml b/app/src/main/res/xml/prefactions__more_information.xml
index f4d13bb484..00970f57dd 100644
--- a/app/src/main/res/xml/prefactions__more_information.xml
+++ b/app/src/main/res/xml/prefactions__more_information.xml
@@ -24,9 +24,10 @@
         tools:summary="Version v0.5" />
 
     <Preference
-        android:icon="@drawable/ic_thumb_up_black_24dp"
-        android:key="@string/pref_key__more_info__rate_app"
-        android:title="@string/rate_this_app" />
+        android:icon="@drawable/ic_bug_report_black_24dp"
+        android:key="@string/pref_key__more_info__bug_reports"
+        android:summary="@string/bug_reports_suggest_improvements"
+        android:title="@string/do_you_have_a_question_or_problem" />
 
     <Preference
         android:icon="@drawable/ic_settings_black_24dp"
@@ -38,14 +39,18 @@
         android:key="@string/pref_key__more_info__help"
         android:title="@string/help" />
 
+    <Preference
+        android:icon="@drawable/ic_thumb_up_black_24dp"
+        android:key="@string/pref_key__more_info__rate_app"
+        android:title="@string/rate_this_app" />
 
-    <PreferenceCategory android:title="@string/contribute">
+    <PreferenceCategory
+        android:key="@string/pref_key__more_info__project_team"
+        android:title="@string/project_team" />
 
-        <Preference
-            android:icon="@drawable/ic_bug_report_black_24dp"
-            android:key="@string/pref_key__more_info__bug_reports"
-            android:summary="@string/bug_reports_suggest_improvements"
-            android:title="@string/report_bugs" />
+    <PreferenceCategory
+        android:key="@string/pref_key__more_info__project_community"
+        android:title="@string/community">
 
         <Preference
             android:icon="@drawable/ic_translate_black_24dp"
@@ -53,18 +58,6 @@
             android:summary="@string/help_translating_this_app"
             android:title="@string/translate" />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="@string/pref_key__more_info__project_team"
-        android:title="@string/project_team">
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="@string/pref_key__more_info__project_community"
-        android:title="@string/community">
-
         <Preference
             android:icon="@drawable/ic_group_black_24dp"
             android:key="@string/pref_key__more_info__join_community"