diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
index 6494eb0d8..a4bf9251a 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
@@ -10,6 +10,25 @@ Item {
         sceneSize: info.sceneSize
     }
 
+    SvgElementImage {
+        id: batinfo_energy
+        elementName: "warning-low-energy"
+        sceneSize: info.sceneSize
+        Rectangle {
+            anchors.fill: batinfo_energy
+            border.width: 0
+            // Alarm based on FlightBatteryState.EstimatedFlightTime < 120s orange, < 60s red
+            color: (FlightBatteryState.EstimatedFlightTime <= 120 && FlightBatteryState.EstimatedFlightTime > 60 ? "orange" :
+                   (FlightBatteryState.EstimatedFlightTime <= 60 ? "red": "black"))
+        }
+    }
+
+    SvgElementImage {
+        id: energy_label
+        elementName: "battery-milliamp-label"
+        sceneSize: info.sceneSize
+    }
+
     Repeater {
         id: satNumberBar
 
@@ -140,8 +159,6 @@ Item {
         }
     }
 
-
-
     SvgElementImage {
         id: mask_ThrottleBar
         elementName: "throttle-mask"
diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
index 7cf4f892f..689e69b6b 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
@@ -58,11 +58,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.46790582"
-     inkscape:cx="320"
-     inkscape:cy="240"
+     inkscape:zoom="4.0481863"
+     inkscape:cx="542.80759"
+     inkscape:cy="430.23672"
      inkscape:document-units="px"
-     inkscape:current-layer="warning-master-caution"
+     inkscape:current-layer="layer48"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
@@ -1137,15 +1137,13 @@
      id="layer3"
      inkscape:label="info"
      style="display:inline"
-     transform="translate(0,-4)"
-     sodipodi:insensitive="true">
+     transform="translate(0,-4)">
     <g
        inkscape:groupmode="layer"
        id="layer48"
        inkscape:label="info-bg"
        style="display:inline"
-       transform="translate(0,4)"
-       sodipodi:insensitive="true">
+       transform="translate(0,4)">
       <g
          id="info-bg"
          inkscape:label="#g4460">
@@ -1264,29 +1262,29 @@
              inkscape:connector-curvature="0" />
         </g>
         <g
-           id="warning-low-battery"
+           id="info-battery"
            inkscape:label="#g3816">
           <rect
              y="0"
              x="551"
              height="17"
              width="89"
-             id="rect3812"
-             style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+             id="warning-low-voltage"
+             style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
           <rect
-             style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             id="rect3814"
+             style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="warning-high-current"
              width="89"
              height="17"
              x="551"
              y="18" />
           <rect
-             y="36"
+             y="35.5"
              x="551"
              height="17"
              width="89"
-             id="rect4586"
-             style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+             id="warning-low-energy"
+             style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
         </g>
         <g
            style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
@@ -1336,7 +1334,7 @@
         <g
            style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
            id="battery-milliamp-label"
-           transform="translate(-2,-4)">
+           transform="matrix(1,0,0,1.0375514,-2,-6.9526728)">
           <path
              d="m 620.206,52 0,-4.224819 0.64048,0 0,0.592748 c 0.13261,-0.206861 0.30897,-0.372618 0.5291,-0.497271 0.22012,-0.127298 0.47075,-0.190948 0.75188,-0.190953 0.31294,5e-6 0.56887,0.06498 0.76778,0.194931 0.20156,0.129957 0.34345,0.311627 0.42567,0.545009 0.33416,-0.493289 0.76911,-0.739935 1.30484,-0.73994 0.41903,5e-6 0.74126,0.116698 0.96669,0.350079 0.22543,0.230738 0.33814,0.587447 0.33815,1.070129 l 0,2.900087 -0.71209,0 0,-2.661397 c -10e-6,-0.286425 -0.0239,-0.491964 -0.0716,-0.616617 -0.0451,-0.127298 -0.12863,-0.229404 -0.25063,-0.306319 -0.122,-0.07691 -0.26521,-0.115363 -0.42964,-0.115367 -0.29704,4e-6 -0.54369,0.09946 -0.73994,0.298363 -0.19626,0.19626 -0.29439,0.511861 -0.29438,0.946805 l 0,2.454532 -0.71608,0 0,-2.744939 c 0,-0.31825 -0.0583,-0.55694 -0.17503,-0.716071 -0.1167,-0.159123 -0.30765,-0.238686 -0.57286,-0.23869 -0.20156,4e-6 -0.38854,0.05305 -0.56092,0.159127 -0.16974,0.106088 -0.29306,0.261237 -0.36997,0.465446 -0.0769,0.204216 -0.11537,0.4986 -0.11537,0.883154 l 0,2.191973 -0.71607,0"
              id="path4641"
@@ -1358,7 +1356,7 @@
         <g
            id="battery-amp-label"
            style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
-           transform="translate(-5.79738,-2.08992)">
+           transform="matrix(1,0,0,1.0375459,-5.79738,-4.2947649)">
           <path
              inkscape:connector-curvature="0"
              id="path4614"
@@ -1373,7 +1371,7 @@
         <g
            style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
            id="battery-volt-label"
-           transform="translate(0,-2.08992)">
+           transform="matrix(1,0,0,1.0375459,0,-3.6189387)">
           <path
              d="m 625.76807,14.08992 -2.22657,-5.8320312 0.82422,0 1.84766,4.9101562 1.85156,-4.9101562 0.82031,0 -2.22265,5.8320312 -0.89453,0"
              style="font-size:8px;fill:#ffffff"
@@ -1496,19 +1494,17 @@
        inkscape:groupmode="layer"
        id="g4727"
        inkscape:label="battery"
-       style="display:inline"
-       sodipodi:insensitive="true">
+       style="display:inline">
       <g
          inkscape:groupmode="layer"
          id="layer66"
          inkscape:label="battery-milliamp-text"
          transform="translate(0,1.768481)"
-         style="display:inline"
-         sodipodi:insensitive="true">
+         style="display:inline">
         <g
            style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
            id="battery-milliamp-text"
-           transform="translate(0,16.595328)">
+           transform="translate(0,17)">
           <path
              d="m 572.57764,32.938553 0,-0.898438 c 0.24739,0.117189 0.49804,0.206707 0.75195,0.268555 0.2539,0.06185 0.50293,0.09277 0.74707,0.09277 0.65104,10e-7 1.14746,-0.218098 1.48926,-0.654296 0.34505,-0.439452 0.54199,-1.105141 0.59082,-1.997071 -0.18881,0.279951 -0.42807,0.494795 -0.71778,0.644532 -0.28971,0.149742 -0.61035,0.224611 -0.96191,0.224609 -0.72917,2e-6 -1.30697,-0.219724 -1.7334,-0.65918 -0.42318,-0.442705 -0.63476,-1.046545 -0.63476,-1.811523 0,-0.748692 0.22135,-1.349278 0.66406,-1.801758 0.44271,-0.452467 1.0319,-0.678704 1.76758,-0.678711 0.84309,7e-6 1.486,0.3239 1.92871,0.97168 0.44596,0.644537 0.66894,1.582036 0.66894,2.8125 0,1.149091 -0.27344,2.067059 -0.82031,2.753906 -0.54362,0.683594 -1.27604,1.02539 -2.19726,1.025391 -0.2474,-10e-7 -0.49805,-0.02441 -0.75196,-0.07324 -0.25391,-0.04883 -0.51758,-0.12207 -0.79101,-0.219726 m 1.96289,-3.09082 c 0.4427,3e-6 0.79264,-0.151364 1.0498,-0.454102 0.26041,-0.30273 0.39062,-0.717769 0.39063,-1.245117 -10e-6,-0.524083 -0.13022,-0.937494 -0.39063,-1.240235 -0.25716,-0.305983 -0.6071,-0.458977 -1.0498,-0.458984 -0.44271,7e-6 -0.79428,0.153001 -1.05469,0.458984 -0.25716,0.302741 -0.38574,0.716152 -0.38574,1.240235 0,0.527348 0.12858,0.942387 0.38574,1.245117 0.26041,0.302738 0.61198,0.454105 1.05469,0.454102"
              style="fill:#ffffff"
@@ -1541,12 +1537,11 @@
          id="layer64"
          inkscape:groupmode="layer"
          transform="translate(0,0.768478)"
-         style="display:inline"
-         sodipodi:insensitive="true">
+         style="display:inline">
         <g
            id="battery-amp-text"
            style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
-           transform="translate(0,16.595328)">
+           transform="translate(0,17)">
           <path
              inkscape:connector-curvature="0"
              id="path4599"
@@ -1578,12 +1573,11 @@
          inkscape:groupmode="layer"
          id="layer65"
          inkscape:label="battery-volt-text"
-         transform="translate(0,-1.231522)"
-         sodipodi:insensitive="true">
+         transform="translate(0,-1.231522)">
         <g
            style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
            id="battery-volt-text"
-           transform="translate(0,1.595328)">
+           transform="translate(0,2)">
           <path
              d="m 575.65771,8.449295 c -0.50781,6.7e-6 -0.8903,0.2506575 -1.14746,0.751953 -0.2539,0.498052 -0.38086,1.248377 -0.38086,2.250977 0,0.999351 0.12696,1.749676 0.38086,2.250976 0.25716,0.498048 0.63965,0.747071 1.14746,0.747071 0.51107,0 0.89356,-0.249023 1.14747,-0.747071 0.25715,-0.5013 0.38573,-1.251625 0.38574,-2.250976 -10e-6,-1.0026 -0.12859,-1.752925 -0.38574,-2.250977 -0.25391,-0.5012955 -0.6364,-0.7519463 -1.14747,-0.751953 m 0,-0.78125 c 0.81706,7.5e-6 1.44043,0.3239004 1.87012,0.9716797 0.43294,0.6445373 0.64941,1.5820363 0.64942,2.8125003 -10e-6,1.227216 -0.21648,2.164715 -0.64942,2.8125 -0.42969,0.644531 -1.05306,0.966796 -1.87012,0.966797 -0.81705,-10e-7 -1.44205,-0.322266 -1.875,-0.966797 -0.42968,-0.647785 -0.64453,-1.585284 -0.64453,-2.8125 0,-1.230464 0.21485,-2.167963 0.64453,-2.8125003 0.43295,-0.6477793 1.05795,-0.9716722 1.875,-0.9716797"
              style="fill:#ffffff"
@@ -2386,8 +2380,7 @@
        inkscape:groupmode="layer"
        id="layer57"
        inkscape:label="gps"
-       style="display:inline"
-       sodipodi:insensitive="true">
+       style="display:inline">
       <g
          inkscape:groupmode="layer"
          id="layer53"
@@ -2477,8 +2470,7 @@
          id="layer52"
          inkscape:label="gps-mode-text"
          style="display:inline"
-         transform="translate(0,-0.972157)"
-         sodipodi:insensitive="true">
+         transform="translate(0,-0.972157)">
         <g
            style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
            id="gps-mode-text"
@@ -2500,8 +2492,7 @@
        inkscape:groupmode="layer"
        id="layer23"
        inkscape:label="info-fg"
-       style="display:inline"
-       sodipodi:insensitive="true">
+       style="display:inline">
       <path
          style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 25,51.418075 60,0.08193 0,-22.998652 -6,-0.0014 0,22.992116 -6,-0.0088 0,-20.97668 6,0.04472 -6,-0.04472 0,2.12303 -6,3.48e-4 0,18.845475 -6,-0.0069 0.02494,-16.83188 5.97506,-0.007 -6.024941,0.007 0.02494,1.934623 -6,-0.07128 0,14.959092 -6,-0.0081 0,-12.950991 6,-3.28e-4 -6,3.28e-4 0,2 -6,0 0,10.942406 0,-8.942406 -6,0 0,8.93472 0,-6.93472 -6,0 0,6.926248 0,-4.926248 -6,5e-6 z"
@@ -4679,12 +4670,13 @@
      inkscape:groupmode="layer"
      id="layer67"
      inkscape:label="warnings"
-     style="display:inline">
+     style="display:none">
     <g
        inkscape:groupmode="layer"
        id="layer68"
        inkscape:label="warnings-bg"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <rect
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0059247;display:inline"
          id="warnings-bg"
@@ -4698,7 +4690,8 @@
        inkscape:groupmode="layer"
        id="layer51"
        inkscape:label="warning-autopilot"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <g
          id="warning-autopilot"
          inkscape:label="#g4860">
@@ -4766,7 +4759,8 @@
        inkscape:groupmode="layer"
        id="layer29"
        inkscape:label="warning-master-caution"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <g
          id="warning-master-caution"
          inkscape:label="#g4850">
@@ -4854,7 +4848,8 @@
        inkscape:groupmode="layer"
        id="layer33"
        inkscape:label="warning-rc-input"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <g
          id="warning-rc-input"
          inkscape:label="#g4855">