diff --git a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt
index c1e236c0712fc932991ecd47255cdeaef3ddbd7f..4d83cb13182ddc18e5482c99c86e8561d74f017b 100644
--- a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022  MURENA SAS
+ * Copyright (C) 2019-2023  MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
 
 package foundation.e.apps.ui.parentFragment
 
+import android.content.Intent
+import android.graphics.Paint
+import android.net.Uri
+import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
@@ -220,6 +224,17 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) {
         }
     }
 
+     private fun openTroubleshootingPage() {
+        val troubleshootUrl = getString(R.string.troubleshootURL)
+        val openUrlIntent = Intent(Intent.ACTION_VIEW)
+        openUrlIntent.data = Uri.parse(troubleshootUrl)
+        startActivity(openUrlIntent)
+    }
+
+    private fun setTextviewUnderlined(textView: TextView) {
+        textView.paintFlags = textView.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+    }
+
     /**
      * Call to trigger [onTimeout].
      * Can be called from anywhere in the fragment.
@@ -235,6 +250,10 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) {
                 logDisplay.isVisible = true
                 moreInfo.isVisible = false
             }
+            setTextviewUnderlined(troubleshootingLink)
+            troubleshootingLink.setOnClickListener {
+                openTroubleshootingPage()
+            }
 
             val logToDisplay = exception.message ?: ""
 
@@ -281,6 +300,10 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) {
                 logDisplay.isVisible = true
                 moreInfo.isVisible = false
             }
+            setTextviewUnderlined(troubleshootingLink)
+            troubleshootingLink.setOnClickListener {
+                openTroubleshootingPage()
+            }
 
             val logToDisplay = exception.message ?: ""
             if (logToDisplay.isNotBlank()) {
@@ -336,6 +359,11 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) {
                 logDisplay.isVisible = true
                 moreInfo.isVisible = false
             }
+            setTextviewUnderlined(troubleshootingLink)
+            troubleshootingLink.setOnClickListener {
+                openTroubleshootingPage()
+            }
+
             val logToDisplay = exception.message ?: ""
             if (logToDisplay.isNotBlank()) {
                 logDisplay.text = logToDisplay
@@ -412,4 +440,4 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) {
         super.onDestroyView()
         authObjects.value = null
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
index cdff64f529a834f7a97919f5228d0ca0e325af16..b2e6140e1afc3609a6bbb45531e4b260ea9a3ebf 100644
--- a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
@@ -1,6 +1,6 @@
 /*
  * Apps  Quickly and easily install Android apps onto your device!
- * Copyright (C) 2022  E FOUNDATION
+ * Copyright (C) 2022-2023  E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml
index 2ebf0bbbdbb6672b2b105174efde4b9aac19adf6..36981c7c1069c3db81a675998c357fd0f4090a46 100644
--- a/app/src/main/res/layout/custom_preference.xml
+++ b/app/src/main/res/layout/custom_preference.xml
@@ -24,6 +24,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -120,7 +121,5 @@
         android:id="@android:id/list_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
     </FrameLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b8f85dce57128473ef315bf3a3dccb2bbb348076
--- /dev/null
+++ b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2023  MURENA SAS
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+        <TextView
+            android:id="@+id/troubleshootingLink"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="end"
+            android:text="@string/having_troubles"
+            android:textColor="@color/colorAccent"
+            android:textSize="15sp"
+            android:textStyle="bold"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_error_log.xml b/app/src/main/res/layout/dialog_error_log.xml
index e4005d62888edd5e2ee3382524d7df09a06239df..52a727d1cd37af2c4a57eb6be70fb0af49319ed3 100644
--- a/app/src/main/res/layout/dialog_error_log.xml
+++ b/app/src/main/res/layout/dialog_error_log.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2019-2022  MURENA SAS
+  ~ Copyright (C) 2019-2023  MURENA SAS
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -56,4 +56,16 @@
 
     </ScrollView>
 
+    <TextView
+        android:id="@+id/troubleshootingLink"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/having_troubles"
+        android:textColor="@color/colorAccent"
+        android:layout_marginTop="10dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_gravity="end"
+        />
+
 </LinearLayout>
\ 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 dc7be94c3e03b8c562b5090ab5447cad4e89790f..6a6dfc14a276c06dbc00cacffcf51d0d515b9840 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <!--
   ~ Apps  Quickly and easily install Android apps onto your device!
-  ~ Copyright (C) 2021  E FOUNDATION
+  ~ Copyright (C) 2023 MURENA SAS
+  ~ Copyright (C) 2021 E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -125,7 +126,8 @@
     <string name="duplicate_app_from_sources">Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates.</string>
     <string name="downloading">Downloading…</string>
     <string name="additional_file_for">Additional file for %s</string>
-
+    <string name="having_troubles">Having troubles?</string>
+    <string name="troubleshootURL" translatable="false">https://doc.e.foundation/support-topics/app_lounge_troubleshooting</string>
 
     <!-- Updates Fragment -->
     <string name="update_all">Update All</string>
diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index 13f2688d10c988acb3c69d966b48046df6f11362..6eeb9c06a5c0164c83b9cdd035386ba2f39c1cee 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Apps  Quickly and easily install Android apps onto your device!
-  ~ Copyright (C) 2022  MURENA SAS
+  ~ Copyright (C) 2022 - 2023  MURENA SAS
   ~ Copyright (C) 2021  E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -23,8 +23,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:iconSpaceReserved="false">
+
+    <Preference
+        android:key="@string/having_troubles"
+        android:layout="@layout/custom_preferences_troubleshooting_link">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="@string/troubleshootURL"/>
+    </Preference>
+
     <PreferenceCategory
         android:title="@string/preference_updates_title"
+        app:allowDividerAbove="false"
         app:allowDividerBelow="true"
         app:iconSpaceReserved="false">
         <ListPreference