diff --git a/js/settings.js b/js/settings.js
index ccc06d10..8545d1e1 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -233,14 +233,14 @@ var Settings = (function () {
 
         const oldValue = element.val();
 
-        //display names for the units
-        const unitDisplayDames = {
+        // Display names for the units
+        const unitDisplayNames = {
             // Misc
-            'us' : "uS",
             'cw' : 'cW',
             'percent' : '%',
             'cmss' : 'cm/s/s',
             // Time
+            'us' : "uS",
             'msec' : 'ms',
             'msec-nc' : 'ms', // Milliseconds, but not converted.
             'dsec' : 'ds',
@@ -275,6 +275,47 @@ var Settings = (function () {
             'nm' : 'NM'
         }
 
+        // Hover full descriptions for the units
+        const unitExpandedNames = {
+            // Misc
+            'cw' : 'CentiWatts',
+            'percent' : 'Percent',
+            'cmss' : 'Centimetres per second, per second',
+            // Time
+            'us' : "Microseconds",
+            'msec' : 'Milliseconds',
+            'msec-nc' : 'Milliseconds',
+            'dsec' : 'Deciseconds',
+            'sec' : 'Seconds',
+            // Angles
+            'deg' : 'Degrees',
+            'decideg' : 'DeciDegrees',
+            'decideg-lrg' : 'DeciDegrees',
+            // Rotational speed
+            'degps' : 'Degrees per second',
+            'decadegps' : 'DecaDegrees per second',
+            // Temperature
+            'decidegc' : 'DeciDegrees Celsius',
+            'degc' : 'Degrees Celsius',
+            'degf' : 'Degrees Fahrenheit',
+            // Speed
+            'cms' : 'Centimetres per second',
+            'v-cms' : 'Centimetres per second',
+            'ms' : 'Metres per second',
+            'kmh' : 'Kilometres per hour',
+            'mph' : 'Miles per hour',
+            'hftmin' : 'Hundred feet per minute',
+            'fts' : 'Feet per second',
+            'kt' : 'Knots',
+            // Distance
+            'cm' : 'Centimetres',
+            'm' : 'Metres',
+            'km' : 'Kilometres',
+            'm-lrg' : 'Metres',
+            'ft' : 'Feet',
+            'mi' : 'Miles',
+            'nm' : 'Nautical Miles'
+        }
 
         // Ensure we can do conversions
         if (!inputUnit || !oldValue || !element) {
@@ -463,7 +504,7 @@ var Settings = (function () {
         element.data('setting-multiplier', multiplier);
 
         // Now wrap the input in a display that shows the unit
-        element.wrap(`<div data-unit="${unitDisplayDames[unitName]}" class="unit_wrapper unit"></div>`);
+        element.wrap(`<div data-unit="${unitDisplayNames[unitName]}" title="${unitExpandedNames[unitName]}" class="unit_wrapper unit"></div>`);
 
         function toFahrenheit(decidegC) {
             return (decidegC / 10) * 1.8 + 32;
diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
index ef8d3806..eaa1ded0 100644
--- a/tabs/advanced_tuning.html
+++ b/tabs/advanced_tuning.html
@@ -128,7 +128,7 @@
                         </div>
 
                         <div class="number">
-                            <input id="pitchToThrottle" type="number" data-setting="nav_fw_pitch2thr" data-setting-multiplier="1" step="1" min="0" max="100" />
+                            <input id="pitchToThrottle" type="number" data-unit="us" data-setting="nav_fw_pitch2thr" data-setting-multiplier="1" step="1" min="0" max="100" />
                             <label for="pitchToThrottle"><span data-i18n="pitchToThrottle"></span></label>
                             <div for="pitchToThrottle" class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div>
                         </div>