diff --git a/data/index.html b/data/index.html
index 488f783..ae9b4a8 100644
--- a/data/index.html
+++ b/data/index.html
@@ -168,11 +168,11 @@
               </tr>
               <tr>
                 <th scope="row">Pressure:</th>
-                <td><b class="ot-pressure"></b> bar</td>
+                <td><b class="ot-pressure"></b> <span class="pressure-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">DHW flow rate:</th>
-                <td><b class="ot-dhw-flow-rate"></b> l/min</td>
+                <td><b class="ot-dhw-flow-rate"></b> <span class="volume-unit"></span>/min</td>
               </tr>
               <tr>
                 <th scope="row">Fault code:</th>
@@ -180,31 +180,31 @@
               </tr>
               <tr>
                 <th scope="row">Indoor temp:</th>
-                <td><b class="indoor-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="indoor-temp"></b> <span class="temp-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">Outdoor temp:</th>
-                <td><b class="outdoor-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="outdoor-temp"></b> <span class="temp-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">Heating temp:</th>
-                <td><b class="heating-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="heating-temp"></b> <span class="temp-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">Heating setpoint temp:</th>
-                <td><b class="heating-setpoint-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="heating-setpoint-temp"></b> <span class="temp-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">Heating return temp:</th>
-                <td><b class="heating-return-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="heating-return-temp"></b> <span class="temp-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">DHW temp:</th>
-                <td><b class="dhw-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="dhw-temp"></b> <span class="temp-unit"></span></td>
               </tr>
               <tr>
                 <th scope="row">Exhaust temp:</th>
-                <td><b class="exhaust-temp"></b> <span class="unit-system"></span></td>
+                <td><b class="exhaust-temp"></b> <span class="temp-unit"></span></td>
               </tr>
             </tbody>
           </table>
diff --git a/data/static/app.js.gz b/data/static/app.js.gz
index bcd065f..c1dc8fe 100644
Binary files a/data/static/app.js.gz and b/data/static/app.js.gz differ
diff --git a/src_data/static/app.js b/src_data/static/app.js
index 17520a8..f7063b8 100644
--- a/src_data/static/app.js
+++ b/src_data/static/app.js
@@ -537,18 +537,24 @@ async function loadVars() {
   let response = await fetch('/api/vars');
   let result = await response.json();
 
-  let unitSystemStr;
+  let tempUnitStr, pressureUnitStr, volumeUnitStr;
   switch (result.system.unitSystem) {
     case 0:
-      unitSystemStr = 'C';
+      tempUnitStr = 'C';
+      pressureUnitStr = 'bar';
+      volumeUnitStr = 'L';
       break;
 
     case 1:
-      unitSystemStr = 'F';
+      tempUnitStr = 'F';
+      pressureUnitStr = 'psi';
+      volumeUnitStr = 'gal';
       break;
 
     default:
-      unitSystemStr = '?';
+      tempUnitStr = '?';
+      pressureUnitStr = '?';
+      volumeUnitStr = '?';
       break;
   }
 
@@ -576,7 +582,9 @@ async function loadVars() {
 
   setBusy('.ot-busy', '.ot-table', false);
 
-  setValue('.unit-system', unitSystemStr);
+  setValue('.temp-unit', tempUnitStr);
+  setValue('.pressure-unit', pressureUnitStr);
+  setValue('.volume-unit', volumeUnitStr);
   setValue('.version', result.system.version);
   setValue('.build-date', result.system.buildDate);
   setValue('.uptime', result.system.uptime);