diff --git a/app/src/main/java/com/michatec/radio/SettingsFragment.kt b/app/src/main/java/com/michatec/radio/SettingsFragment.kt
index 2451588..148d101 100644
--- a/app/src/main/java/com/michatec/radio/SettingsFragment.kt
+++ b/app/src/main/java/com/michatec/radio/SettingsFragment.kt
@@ -46,11 +46,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
         (activity as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
         (activity as AppCompatActivity).supportActionBar?.title = getString(R.string.fragment_settings_title)
         requireActivity().window.navigationBarColor = getColor(requireContext(), android.R.attr.colorBackground)
-
-        // Set TV-specific layout for preferences to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            listView.setBackgroundResource(R.drawable.selector_preference_focus)
-        }
     }
 
     /* Overrides onCreatePreferences from PreferenceFragmentCompat */
@@ -90,10 +85,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
                 return@setOnPreferenceChangeListener false
             }
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceThemeSelection.layoutResource = R.layout.preference_tv
-        }
 
         // set up "Update Station Images" preference
         val preferenceUpdateStationImages = Preference(activity as Context)
@@ -110,11 +101,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             )
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceUpdateStationImages.layoutResource = R.layout.preference_tv
-        }
-
 
         // set up "Update Stations" preference
         val preferenceUpdateCollection = Preference(activity as Context)
@@ -131,10 +117,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             )
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceUpdateCollection.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "M3U Export" preference
@@ -146,10 +128,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             openSaveM3uDialog()
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceM3uExport.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "PLS Export" preference
@@ -161,10 +139,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             openSavePlsDialog()
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferencePlsExport.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "Backup Stations" preference
@@ -176,10 +150,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             openBackupCollectionDialog()
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceBackupCollection.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "Restore Stations" preference
@@ -191,10 +161,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             openRestoreCollectionDialog()
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceRestoreCollection.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "Buffer Size" preference
@@ -205,10 +171,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
         preferenceBufferSize.summaryOn = getString(R.string.pref_buffer_size_summary_enabled)
         preferenceBufferSize.summaryOff = getString(R.string.pref_buffer_size_summary_disabled)
         preferenceBufferSize.setDefaultValue(PreferencesHelper.loadLargeBufferSize())
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceBufferSize.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "Edit Stream Address" preference
@@ -220,10 +182,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
         preferenceEnableEditingStreamUri.summaryOff = getString(R.string.pref_edit_station_stream_summary_disabled)
         preferenceEnableEditingStreamUri.setDefaultValue(PreferencesHelper.loadEditStreamUrisEnabled(context))
         preferenceEnableEditingStreamUri.isEnabled = PreferencesHelper.loadEditStreamUrisEnabled(context)
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceEnableEditingStreamUri.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "Edit Stations" preference
@@ -246,11 +204,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             }
             return@setOnPreferenceChangeListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceEnableEditingGeneral.layoutResource = R.layout.preference_tv
-        }
-
 
         // set up "App Version" preference
         val preferenceAppVersion = Preference(context)
@@ -268,10 +221,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             }
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceAppVersion.layoutResource = R.layout.preference_tv
-        }
 
 
         // set up "GitHub" preference
@@ -288,10 +237,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             startActivity(intent)
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceGitHub.layoutResource = R.layout.preference_tv
-        }
 
         // set up "License" preference
         val preferenceLicense = Preference(context)
@@ -307,10 +252,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             startActivity(intent)
             return@setOnPreferenceClickListener true
         }
-        // Set TV layout for preference to ensure focus is visible
-        if (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_TYPE_MASK == android.content.res.Configuration.UI_MODE_TYPE_TELEVISION) {
-            preferenceLicense.layoutResource = R.layout.preference_tv
-        }
 
 
         // set preference categories
diff --git a/app/src/main/res/drawable/selector_preference_focus.xml b/app/src/main/res/drawable/selector_preference_focus.xml
deleted file mode 100644
index 2b2c10e..0000000
--- a/app/src/main/res/drawable/selector_preference_focus.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_card_stroke_focused" />
-            <corners android:radius="8dp" />
-        </shape>
-    </item>
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_card_stroke_focused" />
-            <corners android:radius="8dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-</selector>
diff --git a/app/src/main/res/layout-television/preference_tv.xml b/app/src/main/res/layout-television/preference_tv.xml
deleted file mode 100644
index 7bfc2d2..0000000
--- a/app/src/main/res/layout-television/preference_tv.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/selector_preference_focus"
-    android:orientation="vertical"
-    android:padding="8dp">
-
-    <FrameLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/preference_tv.xml b/app/src/main/res/layout/preference_tv.xml
deleted file mode 100644
index 7bfc2d2..0000000
--- a/app/src/main/res/layout/preference_tv.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/selector_preference_focus"
-    android:orientation="vertical"
-    android:padding="8dp">
-
-    <FrameLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>