diff --git a/app/src/main/java/org/tvheadend/tvhclient/ui/features/settings/SettingsAdvancedFragment.kt b/app/src/main/java/org/tvheadend/tvhclient/ui/features/settings/SettingsAdvancedFragment.kt
index 73cd9db32c..915fa42a19 100644
--- a/app/src/main/java/org/tvheadend/tvhclient/ui/features/settings/SettingsAdvancedFragment.kt
+++ b/app/src/main/java/org/tvheadend/tvhclient/ui/features/settings/SettingsAdvancedFragment.kt
@@ -20,6 +20,7 @@ import com.squareup.picasso.Picasso
 import org.tvheadend.data.source.MiscDataSource
 import org.tvheadend.tvhclient.BuildConfig
 import org.tvheadend.tvhclient.R
+import org.tvheadend.tvhclient.service.HtspIntentService
 import org.tvheadend.tvhclient.service.HtspService
 import org.tvheadend.tvhclient.ui.common.SuggestionProvider
 import org.tvheadend.tvhclient.ui.features.startup.SplashActivity
@@ -49,6 +50,7 @@ class SettingsAdvancedFragment : BasePreferenceFragment(), Preference.OnPreferen
         findPreference<Preference>("clear_database")?.onPreferenceClickListener = this
         findPreference<Preference>("clear_search_history")?.onPreferenceClickListener = this
         findPreference<Preference>("clear_icon_cache")?.onPreferenceClickListener = this
+        findPreference<Preference>("load_more_epg_data")?.onPreferenceClickListener = this
 
         notificationsEnabledPreference = findPreference("notifications_enabled")
         notifyRunningRecordingCountEnabledPreference = findPreference("notify_running_recording_count_enabled")
@@ -103,10 +105,21 @@ class SettingsAdvancedFragment : BasePreferenceFragment(), Preference.OnPreferen
             "notifications_enabled" -> handlePreferenceNotificationsSelected()
             "notify_running_recording_count_enabled" -> handlePreferenceNotifyRunningRecordingEnabledSelected()
             "notify_low_storage_space_enabled" -> handlePreferenceNotifyLowStorageSpaceSelected()
+            "load_more_epg_data" -> handlePreferenceLoadMoreEpgData()
         }
         return true
     }
 
+    private fun handlePreferenceLoadMoreEpgData() {
+        Timber.d("Load more epg data.")
+        context?.let {
+            val intent = Intent()
+            intent.action = "getMoreEvents"
+            intent.putExtra("numFollowing", 250)
+            HtspIntentService.enqueueWork(it, intent)
+        }
+    }
+
     private fun handlePreferenceNotificationsSelected() {
         if (!isUnlocked) {
             context?.sendSnackbarMessage(R.string.feature_not_available_in_free_version)
@@ -305,7 +318,7 @@ class SettingsAdvancedFragment : BasePreferenceFragment(), Preference.OnPreferen
                     it.sendSnackbarMessage(R.string.clear_icon_cache_done)
 
                     val loadChannelIcons = OneTimeWorkRequest.Builder(LoadChannelIconWorker::class.java).build()
-                    WorkManager.getInstance().enqueueUniqueWork("LoadChannelIcons", ExistingWorkPolicy.REPLACE, loadChannelIcons)
+                    WorkManager.getInstance().enqueueUniqueWork("LoadChannelIcons", ExistingWorkPolicy.APPEND, loadChannelIcons)
                 }
                 negativeButton(R.string.cancel)
             }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e89ac340e0..2587f53870 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -397,4 +397,5 @@
     <string name="wol_send">Wake on LAN Paket erfolgreich an \'%s\' gesendet.</string>
     <string name="wol_send_broadcast">Wake on LAN Paket als Broadcast erfolgreich an \'%s\' gesendet.</string>
     <string name="yesterday">Gestern</string>
+    <string name="pref_load_more_epg_data">Weitere Programme laden</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05c451a9fe..87b1ebb240 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -407,4 +407,5 @@
     <string name="notification_added">Notification was added</string>
     <string name="program_has_already_started">Program has already started</string>
     <string name="program_starts_soon">Program %1$s starts in %2$d minutes</string>
+    <string name="pref_load_more_epg_data">Load more epg data</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences_advanced.xml b/app/src/main/res/xml/preferences_advanced.xml
index 2438bc7a1d..73f20d470e 100644
--- a/app/src/main/res/xml/preferences_advanced.xml
+++ b/app/src/main/res/xml/preferences_advanced.xml
@@ -103,5 +103,8 @@
             android:key="copy_playback_url_to_clipboard_enabled"
             android:summary="@string/pref_copy_playback_url_to_clipboard_enabled_sum"
             android:title="@string/pref_copy_playback_url_to_clipboard_enabled" />
+        <Preference
+            android:key="load_more_epg_data"
+            android:title="@string/pref_load_more_epg_data" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file