diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index e2bfe90f..d33ca44f 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2452,8 +2452,8 @@
     "osdUnitUKTip": {
         "message": "Use metric units except for the speed, which is displayed in miles per hour."
     },
-    "osdAlarmRSSI": {
-        "message": "RSSI"
+    "osd_rssi_alarm": {
+        "message": "RSSI (%)"
     },
     "osdAlarmBATT_CAP": {
         "message": "Used Battery"
@@ -2461,44 +2461,44 @@
     "osdAlarmBATT_CAP_HELP": {
         "message": "The battery capacity used indicator (mah drawn) will flash when the total consumed mah are greater than this value. Requires a current sensor. Zero disables this alarm."
     },
-    "osdAlarmFLY_MINUTES": {
-        "message": "Fly Time"
+    "osd_time_alarm": {
+        "message": "Fly Time (minutes)"
     },
-    "osdAlarmMAX_ALTITUDE": {
-        "message": "Altitude"
+    "osd_alt_alarm": {
+        "message": "Altitude (meters)"
     },
-    "osdAlarmDIST": {
-        "message": "Distance"
+    "osd_dist_alarm": {
+        "message": "Distance (meters)"
     },
     "osdAlarmDIST_HELP": {
         "message": "The distance to home indicator will flash when the distance is greater than this value. Zero disables this alarm."
     },
-    "osdAlarmMAX_NEG_ALTITUDE": {
-        "message": "Negative Altitude"
+    "osd_neg_alt_alarm": {
+        "message": "Negative Altitude (meters)"
     },
     "osdAlarmMAX_NEG_ALTITUDE_HELP": {
         "message": "The altitude indicator will flash when altitude is negative and its absolute value is greater than this alarm. Useful when taking off from elevated places. Zero disables this alarm."
     },
-    "osdAlarmGFORCE": {
+    "osd_gforce_alarm": {
         "message": "g force"
     },
     "osdAlarmGFORCE_HELP": {
         "message": "The g force element will start blinking when greater than this value"
     },
-    "osdAlarmGFORCE_AXIS_MIN": {
+    "osd_gforce_axis_alarm_min": {
         "message": "g force axis min"
     },
     "osdAlarmGFORCE_AXIS_MIN_HELP": {
         "message": "The axes g force elements will start blinking when lower than this value"
     },
-    "osdAlarmGFORCE_AXIS_MAX": {
+    "osd_gforce_axis_alarm_max": {
         "message": "g force axis max"
     },
     "osdAlarmGFORCE_AXIS_MAX_HELP": {
         "message": "The axes g force elements will start blinking when greater than this value"
     },
-    "osdAlarmCURRENT": {
-        "message": "Current"
+    "osd_current_alarm": {
+        "message": "Current (A)"
     },
     "osdAlarmCURRENT_HELP": {
         "message": "The current draw element will start blinking when the consumption is greater than this value. Zero disables this alarm."
diff --git a/tabs/osd.html b/tabs/osd.html
index 3dec76ef..61b80cc7 100644
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -93,6 +93,48 @@
                             </div>
                         </div>
                         <div class="spacer_box settings">
+                            <label for="rssi_alarm">
+                                <input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_rssi_alarm"></span>
+                            </label>
+                            <label for="time_alarm">
+                                <input id="osd_time_alarm" data-setting="osd_time_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_time_alarm"></span>
+                            </label>
+                            <label for="osd_alt_alarm">
+                                <input id="osd_alt_alarm" data-setting="osd_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_alt_alarm"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmMAX_NEG_ALTITUDE_HELP"></div>
+                            <label for="osd_neg_alt_alarm">
+                                <input id="osd_neg_alt_alarm" data-setting="osd_neg_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_neg_alt_alarm"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmDIST_HELP"></div>
+                            <label for="osd_dist_alarm">
+                                <input id="osd_dist_alarm" data-setting="osd_dist_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_dist_alarm"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_HELP"></div>
+                            <label for="osd_gforce_alarm">
+                                <input id="osd_gforce_alarm" data-setting="osd_gforce_alarm" data-setting-multiplier="1" type="number" data-step="0.1" />
+                                <span data-i18n="osd_gforce_alarm"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MIN_HELP"></div>
+                            <label for="osd_gforce_axis_alarm_min">
+                                <input id="osd_gforce_axis_alarm_min" data-setting="osd_gforce_axis_alarm_min" data-setting-multiplier="1" type="number" data-step="0.1" />
+                                <span data-i18n="osd_gforce_axis_alarm_min"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MAX_HELP"></div>
+                            <label for="osd_gforce_axis_alarm_max">
+                                <input id="osd_gforce_axis_alarm_max" data-setting="osd_gforce_axis_alarm_max" data-setting-multiplier="1" type="number" data-step="0.1" />
+                                <span data-i18n="osd_gforce_axis_alarm_max"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmCURRENT_HELP"></div>
+                            <label for="osd_current_alarm">
+                                <input id="osd_current_alarm" data-setting="osd_current_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_current_alarm"></span>
+                            </label>
                             <label for="imu_temp_alarm_min">
                                 <input id="imu_temp_alarm_min" data-setting="osd_imu_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
                                 <span data-i18n="osd_imu_temp_alarm_min"></span>