diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
index 5d6a15530..b0a9518dd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
@@ -59,14 +59,14 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 		findPreference<Preference>(AppSettings.KEY_DYNAMIC_THEME)?.isVisible =
 			AppSettings.isDynamicColorAvailable
 		findPreference<ListPreference>(AppSettings.KEY_DATE_FORMAT)?.run {
-			entryValues = arrayOf("", "MM/dd/yy", "dd/MM/yy", "yyyy-MM-dd", "dd MMM yyyy", "MMM dd, yyyy")
+			entryValues = resources.getStringArray(R.array.date_formats)
 			val now = Date().time
 			entries = entryValues.map { value ->
 				val formattedDate = settings.getDateFormat(value.toString()).format(now)
 				if (value == "") {
 					"${context.getString(R.string.system_default)} ($formattedDate)"
 				} else {
-					"$value ($formattedDate)"
+					formattedDate
 				}
 			}.toTypedArray()
 			setDefaultValueCompat("")
diff --git a/app/src/main/res/color/selector_switch_thumb.xml b/app/src/main/res/color/selector_switch_thumb.xml
index 83d334382..ef1a3cc36 100644
--- a/app/src/main/res/color/selector_switch_thumb.xml
+++ b/app/src/main/res/color/selector_switch_thumb.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorPrimaryContainer" android:state_checked="true" />
-	<item android:color="?colorSurfaceVariant" android:state_checked="false" />
+	<item android:color="?colorPrimaryContainer" android:state_checked="true" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimaryContainer" android:state_checked="true" android:state_enabled="false" />
+	<item android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_switch_track.xml b/app/src/main/res/color/selector_switch_track.xml
index 504337dcb..3779a794a 100644
--- a/app/src/main/res/color/selector_switch_track.xml
+++ b/app/src/main/res/color/selector_switch_track.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorPrimary" android:state_checked="true" />
-	<item android:color="?colorOnSurfaceVariant" android:state_checked="false" />
+	<item android:color="?colorPrimary" android:state_checked="true" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimary" android:state_checked="true" android:state_enabled="false" />
+	<item android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 42412e2a0..b822cd758 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -236,7 +236,7 @@
     <string name="system_default">По умолчанию</string>
     <string name="exclude_nsfw_from_history">Исключить NSFW мангу из истории</string>
     <string name="error_empty_name">Вы должны ввести имя</string>
-    <string name="show_pages_numbers">Пронумерованные страницы</string>
+    <string name="show_pages_numbers">Показывать номера страницы</string>
     <string name="enabled_sources">Включенные источники</string>
     <string name="available_sources">Доступные источники</string>
     <string name="dynamic_theme">Динамическая тема</string>
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index b7f8d578d..2e676d010 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -29,4 +29,12 @@
 		<item>2</item>
 		<item>0</item>
 	</string-array>
+	<string-array name="date_formats">
+		<item />
+		<item>MM/dd/yy</item>
+		<item>dd/MM/yy</item>
+		<item>yyyy-MM-dd</item>
+		<item>dd MMM yyyy</item>
+		<item>MMM dd, yyyy</item>
+	</string-array>
 </resources>