diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index dd59cd5ac..305f88894 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index 4169fbd51..a048c890a 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "hod"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index e48fa2bc5..f1150405e 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index 4fca8a1c2..4d9424b5d 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index 8e53287a7..072148a73 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index a63ca000e..2d82250ec 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index eca12d8ee..342dcef80 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index 0495f5e84..9402c722b 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index f249dafa6..9ef7d57c2 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 4b942015a..5c5c8a537 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "o"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index 25049050c..18633f373 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "시"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index c5afba2bf..b0ae25e7b 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index d12059b6c..2c6e38e7c 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Godz"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index c2ff38fd4..d1e51a077 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "H"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index af78b34e7..1227a738a 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index 09479b806..616e1d9b1 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 1630a813f..7a46a56db 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Ч"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index 45b68a601..3bd5e2ff8 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "hod"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index 9bca64261..d5ad82e6f 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Tim"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index c8ad206ce..abbc68dbf 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index 78972efb5..915925d1d 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS                   "C"
 #define D_UNIT_CENTIMETER                "cм"
 #define D_UNIT_DEGREE                     "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ                     "Гц"
 #define D_UNIT_HOUR                      "г"
 #define D_UNIT_GALLONS                   "гал"
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 0eb04e35c..5e76e6069 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "厘米"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "赫兹"
 #define D_UNIT_HOUR "时"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index 4d834862f..e04296c5a 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -693,6 +693,7 @@
 #define D_UNIT_CELSIUS "C"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_DEGREE "°"
+#define D_UNIT_FAHRENHEIT "F"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "時"
 #define D_UNIT_GALLONS "gal"
diff --git a/tasmota/support.ino b/tasmota/support.ino
index ff767caf6..c2c0819c1 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -620,7 +620,8 @@ float ConvertTempToCelsius(float c)
 
 char TempUnit(void)
 {
-  return (Settings.flag.temperature_conversion) ? 'F' : 'C';  // SetOption8  - Switch between Celsius or Fahrenheit
+  // SetOption8  - Switch between Celsius or Fahrenheit
+  return (Settings.flag.temperature_conversion) ? D_UNIT_FAHRENHEIT : D_UNIT_CELSIUS;
 }
 
 float ConvertHumidity(float h)