diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index 5b4f937ef..000000000
--- a/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<application>
-
-		<activity
-			android:name=".tracker.ui.debug.TrackerDebugActivity"
-			android:label="@string/check_for_new_chapters" />
-
-	</application>
-
-</manifest>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 82ae7cc68..3d68b4970 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -103,9 +103,10 @@
 			<intent-filter>
 				<action android:name="com.samsung.android.support.REMOTE_ACTION" />
 			</intent-filter>
+
 			<meta-data
 				android:name="com.samsung.android.support.REMOTE_ACTION"
-				android:resource="@xml/remote_action"/>
+				android:resource="@xml/remote_action" />
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
@@ -254,6 +255,9 @@
 		<activity
 			android:name="org.koitharu.kotatsu.settings.about.AppUpdateActivity"
 			android:label="@string/app_update_available" />
+		<activity
+			android:name="org.koitharu.kotatsu.tracker.ui.debug.TrackerDebugActivity"
+			android:label="@string/tracker_debug_info" />
 
 		<service
 			android:name="androidx.work.impl.foreground.SystemForegroundService"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 6f9cdc0e7..ed9129ada 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -603,7 +603,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_APP_PASSWORD_NUMERIC = "app_password_num"
 		const val KEY_PROTECT_APP = "protect_app"
 		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
-		const val KEY_APP_VERSION = "app_version"
 		const val KEY_ZOOM_MODE = "zoom_mode"
 		const val KEY_BACKUP = "backup"
 		const val KEY_RESTORE = "restore"
@@ -653,7 +652,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
-		const val KEY_LOGS_SHARE = "logs_share"
 		const val KEY_SOURCES_GRID = "sources_grid"
 		const val KEY_SOURCES_NEW = "sources_new"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
@@ -682,7 +680,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_CF_CONTRAST = "cf_contrast"
 		const val KEY_CF_INVERTED = "cf_inverted"
 		const val KEY_CF_GRAYSCALE = "cf_grayscale"
-		const val KEY_IGNORE_DOZE = "ignore_dose"
 		const val KEY_PAGES_TAB = "pages_tab"
 		const val KEY_DETAILS_TAB = "details_tab"
 		const val KEY_DETAILS_LAST_TAB = "details_last_tab"
@@ -690,11 +687,17 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PAGES_SAVE_DIR = "pages_dir"
 		const val KEY_PAGES_SAVE_ASK = "pages_dir_ask"
 		const val KEY_STATS_ENABLED = "stats_on"
-		const val KEY_APP_UPDATE = "app_update"
-		const val KEY_APP_TRANSLATION = "about_app_translation"
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
 
+		// keys for non-persistent preferences
+		const val KEY_APP_VERSION = "app_version"
+		const val KEY_IGNORE_DOZE = "ignore_dose"
+		const val KEY_TRACKER_DEBUG = "tracker_debug"
+		const val KEY_LOGS_SHARE = "logs_share"
+		const val KEY_APP_UPDATE = "app_update"
+		const val KEY_APP_TRANSLATION = "about_app_translation"
+
 		// old keys are for migration only
 		private const val KEY_IMAGES_PROXY_OLD = "images_proxy"
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt
index 6394cc30d..944355452 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt
@@ -20,6 +20,7 @@ import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.tracker.ui.debug.TrackerDebugActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -40,6 +41,12 @@ class AboutSettingsFragment : BasePreferenceFragment(R.string.about) {
 			isEnabled = VersionId(BuildConfig.VERSION_NAME).isStable
 			if (!isEnabled) isChecked = true
 		}
+		if (!settings.isTrackerEnabled) {
+			findPreference<Preference>(AppSettings.KEY_TRACKER_DEBUG)?.run {
+				isEnabled = false
+				setSummary(R.string.check_for_new_chapters_disabled)
+			}
+		}
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -67,6 +74,12 @@ class AboutSettingsFragment : BasePreferenceFragment(R.string.about) {
 				true
 			}
 
+			AppSettings.KEY_TRACKER_DEBUG -> {
+				startActivity(Intent(preference.context, TrackerDebugActivity::class.java))
+				true
+			}
+
+
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
diff --git a/app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt
similarity index 100%
rename from app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt
diff --git a/app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugItem.kt
similarity index 100%
rename from app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugItem.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugItem.kt
diff --git a/app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt
similarity index 98%
rename from app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt
index bcd0c59a0..517008984 100644
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt
@@ -32,6 +32,7 @@ class TrackerDebugActivity : BaseActivity<ActivityTrackerDebugBinding>(), OnList
 		val tracksAdapter = BaseListAdapter<TrackDebugItem>()
 			.addDelegate(ListItemType.FEED, trackDebugAD(this, coil, this))
 		with(viewBinding.recyclerView) {
+			setHasFixedSize(true)
 			adapter = tracksAdapter
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 		}
diff --git a/app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugViewModel.kt
similarity index 100%
rename from app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugViewModel.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugViewModel.kt
diff --git a/app/src/debug/res/layout/activity_tracker_debug.xml b/app/src/main/res/layout/activity_tracker_debug.xml
similarity index 100%
rename from app/src/debug/res/layout/activity_tracker_debug.xml
rename to app/src/main/res/layout/activity_tracker_debug.xml
diff --git a/app/src/debug/res/layout/item_track_debug.xml b/app/src/main/res/layout/item_track_debug.xml
similarity index 99%
rename from app/src/debug/res/layout/item_track_debug.xml
rename to app/src/main/res/layout/item_track_debug.xml
index 66eb54ee7..dfd208c68 100644
--- a/app/src/debug/res/layout/item_track_debug.xml
+++ b/app/src/main/res/layout/item_track_debug.xml
@@ -14,6 +14,7 @@
 		android:layout_height="40dp"
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="16dp"
+
 		android:layout_marginBottom="16dp"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a91f317b..211b746d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -648,4 +648,6 @@
 	<string name="disable_connectivity_check_summary">Skip the connectivity check in case you have issues with it (e.g. going offline mode even though the network is connected)</string>
 	<string name="disable_nsfw_notifications">Disable NSFW notifications</string>
 	<string name="disable_nsfw_notifications_summary">Do not show notifications about NSFW manga updates</string>
+	<string name="tracker_debug_info">Checking for new chapters log</string>
+	<string name="tracker_debug_info_summary">Debug information about background checks for new chapters</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index cc976ef86..2ce94cb0c 100644
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -28,6 +28,12 @@
 			android:key="logs_share"
 			android:title="@string/share_logs" />
 
+		<Preference
+			android:key="tracker_debug"
+			android:persistent="false"
+			android:summary="@string/tracker_debug_info_summary"
+			android:title="@string/tracker_debug_info" />
+
 		<Preference
 			android:key="about_app_translation"
 			android:summary="@string/about_app_translation_summary"