diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php
index 90e03dee1c..1b36c64aad 100644
--- a/core/default_settings/app_languages.php
+++ b/core/default_settings/app_languages.php
@@ -211,6 +211,75 @@ $text['option-button_icons_never']['ru-ru'] = "Never";
 $text['option-button_icons_never']['sv-se'] = "Never";
 $text['option-button_icons_never']['uk-ua'] = "Never";
 
+$text['option-select']['en-us'] = "Select";
+$text['option-select']['en-gb'] = "Select";
+$text['option-select']['ar-eg'] = "";
+$text['option-select']['de-at'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-ch'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-de'] = "Auswählen";
+$text['option-select']['el-gr'] = "Επιλέξτε";
+$text['option-select']['es-cl'] = "Seleccionar";
+$text['option-select']['es-mx'] = "Seleccionar"; //copied from es-cl
+$text['option-select']['fr-ca'] = "Sélectionner"; //copied from fr-fr
+$text['option-select']['fr-fr'] = "Sélectionner";
+$text['option-select']['he-il'] = "";
+$text['option-select']['it-it'] = "Selezionare";
+$text['option-select']['nl-nl'] = "";
+$text['option-select']['pl-pl'] = "Wybierz";
+$text['option-select']['pt-br'] = "Selecionar"; //copied from pt-pt
+$text['option-select']['pt-pt'] = "Selecionar";
+$text['option-select']['ro-ro'] = "";
+$text['option-select']['ru-ru'] = "Выбрать";
+$text['option-select']['sv-se'] = "Välj";
+$text['option-select']['uk-ua'] = "";
+$text['option-select']['tr-tr'] = "Seç";
+
+$text['option-switch_round']['en-us'] = "Round Switch";
+$text['option-switch_round']['en-gb'] = "Round Switch";
+$text['option-switch_round']['ar-eg'] = "Round Switch";
+$text['option-switch_round']['de-at'] = "Round Switch";
+$text['option-switch_round']['de-ch'] = "Round Switch";
+$text['option-switch_round']['de-de'] = "Round Switch";
+$text['option-switch_round']['el-gr'] = "Round Switch";
+$text['option-switch_round']['es-cl'] = "Round Switch";
+$text['option-switch_round']['es-mx'] = "Round Switch";
+$text['option-switch_round']['fr-ca'] = "Round Switch";
+$text['option-switch_round']['fr-fr'] = "Round Switch";
+$text['option-switch_round']['he-il'] = "Round Switch";
+$text['option-switch_round']['it-it'] = "Round Switch";
+$text['option-switch_round']['nl-nl'] = "Round Switch";
+$text['option-switch_round']['pl-pl'] = "Round Switch";
+$text['option-switch_round']['pt-br'] = "Round Switch";
+$text['option-switch_round']['pt-pt'] = "Round Switch";
+$text['option-switch_round']['ro-ro'] = "Round Switch";
+$text['option-switch_round']['ru-ru'] = "Round Switch";
+$text['option-switch_round']['sv-se'] = "Round Switch";
+$text['option-switch_round']['uk-ua'] = "Round Switch";
+$text['option-switch_round']['tr-tr'] = "Round Switch";
+
+$text['option-switch_square']['en-us'] = "Square Switch";
+$text['option-switch_square']['en-gb'] = "Square Switch";
+$text['option-switch_square']['ar-eg'] = "Square Switch";
+$text['option-switch_square']['de-at'] = "Square Switch";
+$text['option-switch_square']['de-ch'] = "Square Switch";
+$text['option-switch_square']['de-de'] = "Square Switch";
+$text['option-switch_square']['el-gr'] = "Square Switch";
+$text['option-switch_square']['es-cl'] = "Square Switch";
+$text['option-switch_square']['es-mx'] = "Square Switch";
+$text['option-switch_square']['fr-ca'] = "Square Switch";
+$text['option-switch_square']['fr-fr'] = "Square Switch";
+$text['option-switch_square']['he-il'] = "Square Switch";
+$text['option-switch_square']['it-it'] = "Square Switch";
+$text['option-switch_square']['nl-nl'] = "Square Switch";
+$text['option-switch_square']['pl-pl'] = "Square Switch";
+$text['option-switch_square']['pt-br'] = "Square Switch";
+$text['option-switch_square']['pt-pt'] = "Square Switch";
+$text['option-switch_square']['ro-ro'] = "Square Switch";
+$text['option-switch_square']['ru-ru'] = "Square Switch";
+$text['option-switch_square']['sv-se'] = "Square Switch";
+$text['option-switch_square']['uk-ua'] = "Square Switch";
+$text['option-switch_square']['tr-tr'] = "Square Switch";
+
 $text['message-toggled']['en-us'] = "Toggle Completed";
 $text['message-toggled']['en-gb'] = "Toggle Completed";
 $text['message-toggled']['ar-eg'] = "الانتهاء من تبديل";
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index a5931b1664..ad1255dc67 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -665,6 +665,13 @@
 		echo "    	<option value='none' ".(($default_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "input_toggle_style" && $name == "text" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='select'>".$text['option-select']."</option>\n";
+		echo "    	<option value='switch_round' ".(($default_setting_value == "switch_round") ? "selected='selected'" : null).">".$text['option-switch_round']."</option>\n";
+		echo "    	<option value='switch_square' ".(($default_setting_value == "switch_square") ? "selected='selected'" : null).">".$text['option-switch_square']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "users" && $subcategory == "username_format" && $name == "text" ) {
 		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='any' ".($default_setting_value == 'any' ? "selected='selected'" : null).">".$text['option-username_format_any']."</option>\n";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 26e0bfa59f..6276ea68a4 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -480,6 +480,9 @@
 			else if ($category == 'theme' && $subcategory == 'menu_side_item_main_sub_close' && $name == 'text') {
 				echo "		".$text['option-'.$row['default_setting_value']]."\n";
 			}
+			else if ($category == 'theme' && $subcategory == 'input_toggle_style' && $name == 'text') {
+				echo "		".$text['option-'.$row['default_setting_value']]."\n";
+			}
 			else if (substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 				echo "		".(img_spacer('15px', '15px', 'background: '.escape($row['default_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['default_setting_value'], -0.18)).'; padding: -1px;'));
 				echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['default_setting_value'])."</span>\n";
diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php
index 82a128e4ac..6f620aed76 100644
--- a/core/domain_settings/app_languages.php
+++ b/core/domain_settings/app_languages.php
@@ -169,6 +169,75 @@ $text['message-delete_failed']['ru-ru'] = "Не выбрана настройк
 $text['message-delete_failed']['sv-se'] = "Ingen Inställning Markerad";
 $text['message-delete_failed']['uk-ua'] = "Налаштування не вказано";
 
+$text['option-select']['en-us'] = "Select";
+$text['option-select']['en-gb'] = "Select";
+$text['option-select']['ar-eg'] = "";
+$text['option-select']['de-at'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-ch'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-de'] = "Auswählen";
+$text['option-select']['el-gr'] = "Επιλέξτε";
+$text['option-select']['es-cl'] = "Seleccionar";
+$text['option-select']['es-mx'] = "Seleccionar"; //copied from es-cl
+$text['option-select']['fr-ca'] = "Sélectionner"; //copied from fr-fr
+$text['option-select']['fr-fr'] = "Sélectionner";
+$text['option-select']['he-il'] = "";
+$text['option-select']['it-it'] = "Selezionare";
+$text['option-select']['nl-nl'] = "";
+$text['option-select']['pl-pl'] = "Wybierz";
+$text['option-select']['pt-br'] = "Selecionar"; //copied from pt-pt
+$text['option-select']['pt-pt'] = "Selecionar";
+$text['option-select']['ro-ro'] = "";
+$text['option-select']['ru-ru'] = "Выбрать";
+$text['option-select']['sv-se'] = "Välj";
+$text['option-select']['uk-ua'] = "";
+$text['option-select']['tr-tr'] = "Seç";
+
+$text['option-switch_round']['en-us'] = "Round Switch";
+$text['option-switch_round']['en-gb'] = "Round Switch";
+$text['option-switch_round']['ar-eg'] = "Round Switch";
+$text['option-switch_round']['de-at'] = "Round Switch";
+$text['option-switch_round']['de-ch'] = "Round Switch";
+$text['option-switch_round']['de-de'] = "Round Switch";
+$text['option-switch_round']['el-gr'] = "Round Switch";
+$text['option-switch_round']['es-cl'] = "Round Switch";
+$text['option-switch_round']['es-mx'] = "Round Switch";
+$text['option-switch_round']['fr-ca'] = "Round Switch";
+$text['option-switch_round']['fr-fr'] = "Round Switch";
+$text['option-switch_round']['he-il'] = "Round Switch";
+$text['option-switch_round']['it-it'] = "Round Switch";
+$text['option-switch_round']['nl-nl'] = "Round Switch";
+$text['option-switch_round']['pl-pl'] = "Round Switch";
+$text['option-switch_round']['pt-br'] = "Round Switch";
+$text['option-switch_round']['pt-pt'] = "Round Switch";
+$text['option-switch_round']['ro-ro'] = "Round Switch";
+$text['option-switch_round']['ru-ru'] = "Round Switch";
+$text['option-switch_round']['sv-se'] = "Round Switch";
+$text['option-switch_round']['uk-ua'] = "Round Switch";
+$text['option-switch_round']['tr-tr'] = "Round Switch";
+
+$text['option-switch_square']['en-us'] = "Square Switch";
+$text['option-switch_square']['en-gb'] = "Square Switch";
+$text['option-switch_square']['ar-eg'] = "Square Switch";
+$text['option-switch_square']['de-at'] = "Square Switch";
+$text['option-switch_square']['de-ch'] = "Square Switch";
+$text['option-switch_square']['de-de'] = "Square Switch";
+$text['option-switch_square']['el-gr'] = "Square Switch";
+$text['option-switch_square']['es-cl'] = "Square Switch";
+$text['option-switch_square']['es-mx'] = "Square Switch";
+$text['option-switch_square']['fr-ca'] = "Square Switch";
+$text['option-switch_square']['fr-fr'] = "Square Switch";
+$text['option-switch_square']['he-il'] = "Square Switch";
+$text['option-switch_square']['it-it'] = "Square Switch";
+$text['option-switch_square']['nl-nl'] = "Square Switch";
+$text['option-switch_square']['pl-pl'] = "Square Switch";
+$text['option-switch_square']['pt-br'] = "Square Switch";
+$text['option-switch_square']['pt-pt'] = "Square Switch";
+$text['option-switch_square']['ro-ro'] = "Square Switch";
+$text['option-switch_square']['ru-ru'] = "Square Switch";
+$text['option-switch_square']['sv-se'] = "Square Switch";
+$text['option-switch_square']['uk-ua'] = "Square Switch";
+$text['option-switch_square']['tr-tr'] = "Square Switch";
+
 $text['label-web_fonts']['en-us'] = "Web Fonts";
 $text['label-web_fonts']['en-gb'] = "Web Fonts";
 $text['label-web_fonts']['ar-eg'] = "الخطوط على شبكة الإنترنت";
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index e37533ef35..8f28fed5e0 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -704,6 +704,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "input_toggle_style" && $name == "text" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='select'>".$text['option-select']."</option>\n";
+		echo "    	<option value='switch_round' ".(($row['domain_setting_value'] == "switch_round") ? "selected='selected'" : null).">".$text['option-switch_round']."</option>\n";
+		echo "    	<option value='switch_square' ".(($row['domain_setting_value'] == "switch_square") ? "selected='selected'" : null).">".$text['option-switch_square']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "users" && $subcategory == "username_format" && $name == "text" ) {
 		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
 		echo "    	<option value='any' ".($row['domain_setting_value'] == 'any' ? "selected='selected'" : null).">".$text['option-username_format_any']."</option>\n";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index f0c226fc8b..41099d5b07 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -335,6 +335,9 @@
 			else if ($category == 'theme' && $subcategory == 'menu_side_item_main_sub_close' && $name == 'text') {
 				echo "		".$text['option-'.$row['domain_setting_value']]."\n";
 			}
+			else if ($category == 'theme' && $subcategory == 'input_toggle_style' && $name == 'text') {
+				echo "		".$text['option-'.$row['domain_setting_value']]."\n";
+			}
 			else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 				echo "		".(img_spacer('15px', '15px', 'background: '.escape($row['domain_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['domain_setting_value'], -0.18)).'; padding: -1px;'));
 				echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['domain_setting_value'])."</span>\n";
diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php
index d66358b473..eb9d2552f6 100644
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@@ -421,6 +421,75 @@ $text['login-message_attention']['ru-ru'] = "Внимание!";
 $text['login-message_attention']['sv-se'] = "Observera!";
 $text['login-message_attention']['uk-ua'] = "Увага!";
 
+$text['option-select']['en-us'] = "Select";
+$text['option-select']['en-gb'] = "Select";
+$text['option-select']['ar-eg'] = "";
+$text['option-select']['de-at'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-ch'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-de'] = "Auswählen";
+$text['option-select']['el-gr'] = "Επιλέξτε";
+$text['option-select']['es-cl'] = "Seleccionar";
+$text['option-select']['es-mx'] = "Seleccionar"; //copied from es-cl
+$text['option-select']['fr-ca'] = "Sélectionner"; //copied from fr-fr
+$text['option-select']['fr-fr'] = "Sélectionner";
+$text['option-select']['he-il'] = "";
+$text['option-select']['it-it'] = "Selezionare";
+$text['option-select']['nl-nl'] = "";
+$text['option-select']['pl-pl'] = "Wybierz";
+$text['option-select']['pt-br'] = "Selecionar"; //copied from pt-pt
+$text['option-select']['pt-pt'] = "Selecionar";
+$text['option-select']['ro-ro'] = "";
+$text['option-select']['ru-ru'] = "Выбрать";
+$text['option-select']['sv-se'] = "Välj";
+$text['option-select']['uk-ua'] = "";
+$text['option-select']['tr-tr'] = "Seç";
+
+$text['option-switch_round']['en-us'] = "Round Switch";
+$text['option-switch_round']['en-gb'] = "Round Switch";
+$text['option-switch_round']['ar-eg'] = "Round Switch";
+$text['option-switch_round']['de-at'] = "Round Switch";
+$text['option-switch_round']['de-ch'] = "Round Switch";
+$text['option-switch_round']['de-de'] = "Round Switch";
+$text['option-switch_round']['el-gr'] = "Round Switch";
+$text['option-switch_round']['es-cl'] = "Round Switch";
+$text['option-switch_round']['es-mx'] = "Round Switch";
+$text['option-switch_round']['fr-ca'] = "Round Switch";
+$text['option-switch_round']['fr-fr'] = "Round Switch";
+$text['option-switch_round']['he-il'] = "Round Switch";
+$text['option-switch_round']['it-it'] = "Round Switch";
+$text['option-switch_round']['nl-nl'] = "Round Switch";
+$text['option-switch_round']['pl-pl'] = "Round Switch";
+$text['option-switch_round']['pt-br'] = "Round Switch";
+$text['option-switch_round']['pt-pt'] = "Round Switch";
+$text['option-switch_round']['ro-ro'] = "Round Switch";
+$text['option-switch_round']['ru-ru'] = "Round Switch";
+$text['option-switch_round']['sv-se'] = "Round Switch";
+$text['option-switch_round']['uk-ua'] = "Round Switch";
+$text['option-switch_round']['tr-tr'] = "Round Switch";
+
+$text['option-switch_square']['en-us'] = "Square Switch";
+$text['option-switch_square']['en-gb'] = "Square Switch";
+$text['option-switch_square']['ar-eg'] = "Square Switch";
+$text['option-switch_square']['de-at'] = "Square Switch";
+$text['option-switch_square']['de-ch'] = "Square Switch";
+$text['option-switch_square']['de-de'] = "Square Switch";
+$text['option-switch_square']['el-gr'] = "Square Switch";
+$text['option-switch_square']['es-cl'] = "Square Switch";
+$text['option-switch_square']['es-mx'] = "Square Switch";
+$text['option-switch_square']['fr-ca'] = "Square Switch";
+$text['option-switch_square']['fr-fr'] = "Square Switch";
+$text['option-switch_square']['he-il'] = "Square Switch";
+$text['option-switch_square']['it-it'] = "Square Switch";
+$text['option-switch_square']['nl-nl'] = "Square Switch";
+$text['option-switch_square']['pl-pl'] = "Square Switch";
+$text['option-switch_square']['pt-br'] = "Square Switch";
+$text['option-switch_square']['pt-pt'] = "Square Switch";
+$text['option-switch_square']['ro-ro'] = "Square Switch";
+$text['option-switch_square']['ru-ru'] = "Square Switch";
+$text['option-switch_square']['sv-se'] = "Square Switch";
+$text['option-switch_square']['uk-ua'] = "Square Switch";
+$text['option-switch_square']['tr-tr'] = "Square Switch";
+
 $text['label-welcome']['en-us'] = "Welcome:";
 $text['label-welcome']['en-gb'] = "Welcome:";
 $text['label-welcome']['ar-eg'] = "أهلا بك:";
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index c195caf7fa..fdc27ab7a5 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -666,6 +666,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($user_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($user_setting_category == "theme" && $user_setting_subcategory == "input_toggle_style" && $user_setting_name == "text" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='select'>".$text['option-select']."</option>\n";
+		echo "    	<option value='switch_round' ".(($user_setting_value == "switch_round") ? "selected='selected'" : null).">".$text['option-switch_round']."</option>\n";
+		echo "    	<option value='switch_square' ".(($user_setting_value == "switch_square") ? "selected='selected'" : null).">".$text['option-switch_square']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($user_setting_category == "users" && $user_setting_subcategory == "username_format" && $user_setting_name == "text" ) {
 		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
 		echo "    	<option value='any' ".($user_setting_value == 'any' ? "selected='selected'" : null).">".$text['option-username_format_any']."</option>\n";
diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php
index b92c9fedff..a153674b99 100644
--- a/core/user_settings/user_settings.php
+++ b/core/user_settings/user_settings.php
@@ -296,6 +296,9 @@
 			else if ($category == 'theme' && $subcategory == 'menu_side_toggle_body_width' && $name == 'text') {
 				echo "		".$text['option-'.$row['user_setting_value']]."\n";
 			}
+			else if ($category == 'theme' && $subcategory == 'input_toggle_style' && $name == 'text') {
+				echo "		".$text['option-'.$row['user_setting_value']]."\n";
+			}
 			else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 				echo "		".(img_spacer('15px', '15px', 'background: '.escape($row['user_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['user_setting_value'], -0.18)).'; padding: -1px;'));
 				echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['user_setting_value'])."</span>\n";
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 0f0e70094a..0b11bf6364 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -318,6 +318,75 @@ $text['option-available']['ru-ru'] = "Доступен";
 $text['option-available']['sv-se'] = "Tillgänglig";
 $text['option-available']['uk-ua'] = "Доступний";
 
+$text['option-select']['en-us'] = "Select";
+$text['option-select']['en-gb'] = "Select";
+$text['option-select']['ar-eg'] = "";
+$text['option-select']['de-at'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-ch'] = "Auswählen"; //copied from de-de
+$text['option-select']['de-de'] = "Auswählen";
+$text['option-select']['el-gr'] = "Επιλέξτε";
+$text['option-select']['es-cl'] = "Seleccionar";
+$text['option-select']['es-mx'] = "Seleccionar"; //copied from es-cl
+$text['option-select']['fr-ca'] = "Sélectionner"; //copied from fr-fr
+$text['option-select']['fr-fr'] = "Sélectionner";
+$text['option-select']['he-il'] = "";
+$text['option-select']['it-it'] = "Selezionare";
+$text['option-select']['nl-nl'] = "";
+$text['option-select']['pl-pl'] = "Wybierz";
+$text['option-select']['pt-br'] = "Selecionar"; //copied from pt-pt
+$text['option-select']['pt-pt'] = "Selecionar";
+$text['option-select']['ro-ro'] = "";
+$text['option-select']['ru-ru'] = "Выбрать";
+$text['option-select']['sv-se'] = "Välj";
+$text['option-select']['uk-ua'] = "";
+$text['option-select']['tr-tr'] = "Seç";
+
+$text['option-switch_round']['en-us'] = "Round Switch";
+$text['option-switch_round']['en-gb'] = "Round Switch";
+$text['option-switch_round']['ar-eg'] = "Round Switch";
+$text['option-switch_round']['de-at'] = "Round Switch";
+$text['option-switch_round']['de-ch'] = "Round Switch";
+$text['option-switch_round']['de-de'] = "Round Switch";
+$text['option-switch_round']['el-gr'] = "Round Switch";
+$text['option-switch_round']['es-cl'] = "Round Switch";
+$text['option-switch_round']['es-mx'] = "Round Switch";
+$text['option-switch_round']['fr-ca'] = "Round Switch";
+$text['option-switch_round']['fr-fr'] = "Round Switch";
+$text['option-switch_round']['he-il'] = "Round Switch";
+$text['option-switch_round']['it-it'] = "Round Switch";
+$text['option-switch_round']['nl-nl'] = "Round Switch";
+$text['option-switch_round']['pl-pl'] = "Round Switch";
+$text['option-switch_round']['pt-br'] = "Round Switch";
+$text['option-switch_round']['pt-pt'] = "Round Switch";
+$text['option-switch_round']['ro-ro'] = "Round Switch";
+$text['option-switch_round']['ru-ru'] = "Round Switch";
+$text['option-switch_round']['sv-se'] = "Round Switch";
+$text['option-switch_round']['uk-ua'] = "Round Switch";
+$text['option-switch_round']['tr-tr'] = "Round Switch";
+
+$text['option-switch_square']['en-us'] = "Square Switch";
+$text['option-switch_square']['en-gb'] = "Square Switch";
+$text['option-switch_square']['ar-eg'] = "Square Switch";
+$text['option-switch_square']['de-at'] = "Square Switch";
+$text['option-switch_square']['de-ch'] = "Square Switch";
+$text['option-switch_square']['de-de'] = "Square Switch";
+$text['option-switch_square']['el-gr'] = "Square Switch";
+$text['option-switch_square']['es-cl'] = "Square Switch";
+$text['option-switch_square']['es-mx'] = "Square Switch";
+$text['option-switch_square']['fr-ca'] = "Square Switch";
+$text['option-switch_square']['fr-fr'] = "Square Switch";
+$text['option-switch_square']['he-il'] = "Square Switch";
+$text['option-switch_square']['it-it'] = "Square Switch";
+$text['option-switch_square']['nl-nl'] = "Square Switch";
+$text['option-switch_square']['pl-pl'] = "Square Switch";
+$text['option-switch_square']['pt-br'] = "Square Switch";
+$text['option-switch_square']['pt-pt'] = "Square Switch";
+$text['option-switch_square']['ro-ro'] = "Square Switch";
+$text['option-switch_square']['ru-ru'] = "Square Switch";
+$text['option-switch_square']['sv-se'] = "Square Switch";
+$text['option-switch_square']['uk-ua'] = "Square Switch";
+$text['option-switch_square']['tr-tr'] = "Square Switch";
+
 $text['message-username_exists']['en-us'] = "Username Already Exists";
 $text['message-username_exists']['en-gb'] = "Username Already Exists";
 $text['message-username_exists']['ar-eg'] = "";
diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 6e8f47e84a..c6ad89b068 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -1693,7 +1693,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "switch_round";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the toggle control style. Options: 'select' (default), 'switch_square', 'switch_round'";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the toggle control style.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c2630eb3-a04e-4a32-9990-45f37af70005";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";