diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump.bob
index dc2d1b617894051cae66fa0f9201a5d60f6e34a5..f5a27f7dc856c3fa166ecaf0c0ec24aa42525801 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump.bob
@@ -6,12 +6,13 @@
     <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
     <vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
   </macros>
-  <height>460</height>
+  <width>410</width>
+  <height>250</height>
   <widget type="label" version="2.0.0">
     <name>Title</name>
-    <text>            $(TITLE) Legend</text>
-    <width>800</width>
-    <height>80</height>
+    <text>$(TITLE)</text>
+    <width>410</width>
+    <height>60</height>
     <font>
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
@@ -25,168 +26,172 @@
       </color>
     </background_color>
     <transparent>false</transparent>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>NOMINAL Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-nominal-speed.png</file>
-    <x>10</x>
-    <y>110</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>At Nominal Speed</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>NOMINAL Status</name>
-    <text>Nominal
-Speed</text>
-    <x>66</x>
-    <y>110</y>
-    <width>90</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>NOMINAL Description</name>
-    <text>This status is set if the “nominal speed” status is true</text>
-    <x>170</x>
-    <y>110</y>
-    <width>610</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>ACCELERATING Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-acceleration.png</file>
+    <name>Tip</name>
+    <text>Check the tooltips for explanations!</text>
     <x>10</x>
-    <y>180</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>Accelerating</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>ACCELERATING Status</name>
-    <text>Accelerating</text>
-    <x>66</x>
-    <y>180</y>
-    <width>90</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
+    <y>70</y>
+    <width>390</width>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>ACCELERATING Description</name>
-    <text>This status is set if the “start command feedback” status is true and the “nominal speed” status is false</text>
-    <x>170</x>
-    <y>180</y>
-    <width>610</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>OFF Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</file>
-    <x>10</x>
-    <y>250</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>OFF</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>OFF Status</name>
-    <text>OFF</text>
-    <x>66</x>
-    <y>250</y>
-    <width>90</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+  <widget type="group" version="2.0.0">
+    <name>Group - Block icon</name>
+    <x>67</x>
+    <y>100</y>
+    <width>266</width>
+    <height>140</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Device</name>
+      <text>$(vacDEV)</text>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font name="LARGE-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="21.0">
+        </font>
       </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>OFF Description</name>
-    <text>This status is set if the “start command feedback” status is false</text>
-    <x>170</x>
-    <y>250</y>
-    <width>610</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>ERROR Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</file>
-    <x>10</x>
-    <y>320</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>ERROR</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>ERROR Status</name>
-    <text>ERROR</text>
-    <x>66</x>
-    <y>320</y>
-    <width>90</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>ERROR Description</name>
-    <text>This status is set if the “error status” generated by the pump’s controller is true</text>
-    <x>170</x>
-    <y>320</y>
-    <width>610</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>INVALID Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</file>
-    <x>10</x>
-    <y>390</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>INVALID</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>INVALID Status</name>
-    <text>INVALID</text>
-    <x>66</x>
-    <y>390</y>
-    <width>90</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Type of device
+sec-subsec:dis-DEV-idx</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Index</name>
+      <text>IDX</text>
+      <y>60</y>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font name="LARGE-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="21.0">
+        </font>
       </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>INVALID Description</name>
-    <text>This status is set if none of the above is applicable</text>
-    <x>170</x>
-    <y>390</y>
-    <width>610</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>The index part of device name
+sec-subsec:dis-dev-IDX</tooltip>
+    </widget>
+    <widget type="symbol" version="2.0.0">
+      <name>Symbol</name>
+      <pv_name>sim://ramp(0,4,2)</pv_name>
+      <symbols>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-acceleration.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-nominal-speed.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</symbol>
+      </symbols>
+      <x>96</x>
+      <y>3</y>
+      <width>92</width>
+      <height>92</height>
+      <actions>
+      </actions>
+      <tooltip></tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Open Symbol Legend</name>
+      <actions>
+        <action type="open_display">
+          <file>legend_pump_symbol.bob</file>
+          <target>standalone</target>
+          <description>Open Symbol Legend</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>96</x>
+      <y>3</y>
+      <width>92</width>
+      <height>92</height>
+      <transparent>true</transparent>
+      <tooltip>Symbol
+GREEN - NOMINAL SPEED
+BLUE    - ACCELERATING
+WHITE  - STOPPED
+RED      - ERROR
+GRAY    - INVALID</tooltip>
+    </widget>
+    <widget type="symbol" version="2.0.0">
+      <name>Interlock_badge</name>
+      <pv_name>sim://ramp(0,4,2)</pv_name>
+      <symbols>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-invalid.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-healthy.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-tripped.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-overridden.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-disabled.png</symbol>
+      </symbols>
+      <x>92</x>
+      <y>104</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip></tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Open Interlock Legend</name>
+      <actions>
+        <action type="open_display">
+          <file>legend_interlocks.bob</file>
+          <target>standalone</target>
+          <description>Open Interlock Legend</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>92</x>
+      <y>104</y>
+      <width>32</width>
+      <height>32</height>
+      <transparent>true</transparent>
+      <tooltip>Interlock status
+Clickable - will show a window with the status of all the various interlocks
+GREEN   - HEALTHY
+YELLOW - OVERRIDDEN
+WHITE    - DISABLED
+RED        - TRIPPED
+GRAY      - INVALID</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Locked</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/lock@32.png</file>
+      <x>198</x>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Automatic Start Disabled</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Started</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/started@32.png</file>
+      <x>198</x>
+      <y>68</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Started</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Manual</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/manual@32.png</file>
+      <x>232</x>
+      <y>68</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Manual Control Enabled</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Warning</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/warning@32.png</file>
+      <x>198</x>
+      <y>104</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Warning
+Clickable - Will show a window with the warning and error status and message</tooltip>
+    </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_symbol.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_symbol.bob
new file mode 100644
index 0000000000000000000000000000000000000000..dc2d1b617894051cae66fa0f9201a5d60f6e34a5
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_symbol.bob
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(vacDEV) - Vacuum Pump Legend</name>
+  <macros>
+    <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
+    <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
+    <vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
+  </macros>
+  <height>460</height>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <text>            $(TITLE) Legend</text>
+    <width>800</width>
+    <height>80</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="White" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Primary Blue" red="0" green="148" blue="202">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>NOMINAL Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-nominal-speed.png</file>
+    <x>10</x>
+    <y>110</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>At Nominal Speed</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>NOMINAL Status</name>
+    <text>Nominal
+Speed</text>
+    <x>66</x>
+    <y>110</y>
+    <width>90</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>NOMINAL Description</name>
+    <text>This status is set if the “nominal speed” status is true</text>
+    <x>170</x>
+    <y>110</y>
+    <width>610</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>ACCELERATING Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-acceleration.png</file>
+    <x>10</x>
+    <y>180</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>Accelerating</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ACCELERATING Status</name>
+    <text>Accelerating</text>
+    <x>66</x>
+    <y>180</y>
+    <width>90</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ACCELERATING Description</name>
+    <text>This status is set if the “start command feedback” status is true and the “nominal speed” status is false</text>
+    <x>170</x>
+    <y>180</y>
+    <width>610</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>OFF Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</file>
+    <x>10</x>
+    <y>250</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>OFF</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>OFF Status</name>
+    <text>OFF</text>
+    <x>66</x>
+    <y>250</y>
+    <width>90</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>OFF Description</name>
+    <text>This status is set if the “start command feedback” status is false</text>
+    <x>170</x>
+    <y>250</y>
+    <width>610</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>ERROR Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</file>
+    <x>10</x>
+    <y>320</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>ERROR</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ERROR Status</name>
+    <text>ERROR</text>
+    <x>66</x>
+    <y>320</y>
+    <width>90</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ERROR Description</name>
+    <text>This status is set if the “error status” generated by the pump’s controller is true</text>
+    <x>170</x>
+    <y>320</y>
+    <width>610</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>INVALID Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</file>
+    <x>10</x>
+    <y>390</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>INVALID</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>INVALID Status</name>
+    <text>INVALID</text>
+    <x>66</x>
+    <y>390</y>
+    <width>90</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>INVALID Description</name>
+    <text>This status is set if none of the above is applicable</text>
+    <x>170</x>
+    <y>390</y>
+    <width>610</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi.bob
index 272284541945d373acd173b4cc210ea482eae51b..3de31818e71f688ef5d713f167b23fac204e5057 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi.bob
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(vacDEV) - Vacuum Gauge Legend</name>
+  <name>$(vacDEV) - Vacuum Pump Legend</name>
   <macros>
     <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
     <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
+    <vacDEV>vpi</vacDEV>
     <vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
   </macros>
-  <height>530</height>
+  <width>410</width>
+  <height>250</height>
   <widget type="label" version="2.0.0">
     <name>Title</name>
-    <text>            $(TITLE) Legend</text>
-    <width>800</width>
-    <height>80</height>
+    <text>$(TITLE)</text>
+    <width>410</width>
+    <height>60</height>
     <font>
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
@@ -25,203 +27,174 @@
       </color>
     </background_color>
     <transparent>false</transparent>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>ON Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</file>
-    <x>10</x>
-    <y>110</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>ON</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>ON Status</name>
-    <text>ON</text>
-    <x>66</x>
-    <y>110</y>
-    <width>60</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>ON Description</name>
-    <text>This status is set if the “on status” is true</text>
-    <x>140</x>
-    <y>110</y>
-    <width>640</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>OFF Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</file>
-    <x>10</x>
-    <y>180</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>OFF</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>OFF Status</name>
-    <text>OFF</text>
-    <x>66</x>
-    <y>180</y>
-    <width>60</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>OFF Description</name>
-    <text>This status is set if the “off status” is true</text>
-    <x>140</x>
-    <y>180</y>
-    <width>640</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>ERROR Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</file>
-    <x>10</x>
-    <y>250</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>ERROR</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>ERROR Status</name>
-    <text>ERROR</text>
-    <x>66</x>
-    <y>250</y>
-    <width>60</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>ERROR Description</name>
-    <text>This status is set if the “error status” generated by the pump controller is true</text>
-    <x>140</x>
-    <y>250</y>
-    <width>640</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>OVER-RANGE Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-over-range.png</file>
+    <name>Tip</name>
+    <text>Check the tooltips for explanations!</text>
     <x>10</x>
-    <y>320</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>OVER-RANGE</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>OVER-RANGE Status</name>
-    <text>OVER-
-RANGE</text>
-    <x>66</x>
-    <y>320</y>
-    <width>60</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
+    <y>70</y>
+    <width>390</width>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>OVER-RANGE Description</name>
-    <text>This status is set if the actual pressure is too high for the pump’s nominal operating range.
-Pressure display is the over-range pressure given by the hardware manufacturer (in mbar).</text>
-    <x>140</x>
-    <y>320</y>
-    <width>640</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>UNDER-RANGE Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-under-range.png</file>
-    <x>10</x>
-    <y>390</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>UNDER-RANGE</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>UNDER-RANGE Status</name>
-    <text>UNDER-
-RANGE</text>
-    <x>66</x>
-    <y>390</y>
-    <width>60</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+  <widget type="group" version="2.0.0">
+    <name>Group - Block icon</name>
+    <x>67</x>
+    <y>100</y>
+    <width>266</width>
+    <height>140</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Device</name>
+      <text>$(vacDEV)</text>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font name="LARGE-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="21.0">
+        </font>
       </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>UNDER-RANGE Description</name>
-    <text>This status is set if the actual pressure is too low for the pump’s nominal operating range.
-Pressure display is the under-range pressure given by the hardware manufacturer (in mbar).</text>
-    <x>140</x>
-    <y>390</y>
-    <width>640</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="picture" version="2.0.0">
-    <name>INVALID Symbol</name>
-    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</file>
-    <x>10</x>
-    <y>460</y>
-    <width>50</width>
-    <height>50</height>
-    <tooltip>INVALID</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>INVALID Status</name>
-    <text>INVALID</text>
-    <x>66</x>
-    <y>460</y>
-    <width>60</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Type of device
+sec-subsec:dis-DEV-idx</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Index</name>
+      <text>IDX</text>
+      <y>60</y>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font name="LARGE-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="21.0">
+        </font>
       </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>INVALID Description</name>
-    <text>This status is set if none of the above is applicable</text>
-    <x>140</x>
-    <y>460</y>
-    <width>640</width>
-    <height>50</height>
-    <vertical_alignment>1</vertical_alignment>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>The index part of device name
+sec-subsec:dis-dev-IDX</tooltip>
+    </widget>
+    <widget type="symbol" version="2.0.0">
+      <name>Symbol</name>
+      <pv_name>sim://ramp(0,5,2)</pv_name>
+      <symbols>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-over-range.png</symbol>
+        <symbol>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-under-range.png</symbol>
+      </symbols>
+      <x>96</x>
+      <y>3</y>
+      <width>92</width>
+      <height>92</height>
+      <actions>
+      </actions>
+      <tooltip></tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Open Symbol Legend</name>
+      <actions>
+        <action type="open_display">
+          <file>legend_pump_vpi_symbol.bob</file>
+          <target>standalone</target>
+          <description>Open Symbol Legend</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>96</x>
+      <y>3</y>
+      <width>92</width>
+      <height>92</height>
+      <transparent>true</transparent>
+      <tooltip>Symbol
+GREEN            - ON
+WHITE             - OFF
+YELLOW          - OVERRANGE
+DARK GREEN  - UNDERRANGE
+RED                - ERROR
+GRAY              - INVALID</tooltip>
+    </widget>
+    <widget type="symbol" version="2.0.0">
+      <name>Interlock_badge</name>
+      <pv_name>sim://ramp(0,4,2)</pv_name>
+      <symbols>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-invalid.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-healthy.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-tripped.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-overridden.png</symbol>
+        <symbol>$(vacSYMBOLS)/interlock/interlock-disabled.png</symbol>
+      </symbols>
+      <x>92</x>
+      <y>104</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip></tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Open Interlock Legend</name>
+      <actions>
+        <action type="open_display">
+          <file>legend_interlocks.bob</file>
+          <target>standalone</target>
+          <description>Open Interlock Legend</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>92</x>
+      <y>104</y>
+      <width>32</width>
+      <height>32</height>
+      <transparent>true</transparent>
+      <tooltip>Interlock status
+Clickable - will show a window with the status of all the various interlocks
+GREEN   - HEALTHY
+YELLOW - OVERRIDDEN
+WHITE    - DISABLED
+RED        - TRIPPED
+GRAY      - INVALID</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Locked</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/lock@32.png</file>
+      <x>198</x>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Automatic Start Disabled</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Started</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/started@32.png</file>
+      <x>198</x>
+      <y>68</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Started</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Manual</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/manual@32.png</file>
+      <x>232</x>
+      <y>68</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Manual Control Enabled</tooltip>
+    </widget>
+    <widget type="picture" version="2.0.0">
+      <name>Badge Warning</name>
+      <file>$(ESS_SYMBOLS=/ess-symbols)/badges/vacuum/warning@32.png</file>
+      <x>198</x>
+      <y>104</y>
+      <width>32</width>
+      <height>32</height>
+      <tooltip>Warning
+Clickable - Will show a window with the warning and error status and message</tooltip>
+    </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi_symbol.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi_symbol.bob
new file mode 100644
index 0000000000000000000000000000000000000000..272284541945d373acd173b4cc210ea482eae51b
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_pump_vpi_symbol.bob
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(vacDEV) - Vacuum Gauge Legend</name>
+  <macros>
+    <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
+    <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
+    <vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
+  </macros>
+  <height>530</height>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <text>            $(TITLE) Legend</text>
+    <width>800</width>
+    <height>80</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="White" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Primary Blue" red="0" green="148" blue="202">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>ON Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-on.png</file>
+    <x>10</x>
+    <y>110</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>ON</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ON Status</name>
+    <text>ON</text>
+    <x>66</x>
+    <y>110</y>
+    <width>60</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ON Description</name>
+    <text>This status is set if the “on status” is true</text>
+    <x>140</x>
+    <y>110</y>
+    <width>640</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>OFF Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-off.png</file>
+    <x>10</x>
+    <y>180</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>OFF</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>OFF Status</name>
+    <text>OFF</text>
+    <x>66</x>
+    <y>180</y>
+    <width>60</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>OFF Description</name>
+    <text>This status is set if the “off status” is true</text>
+    <x>140</x>
+    <y>180</y>
+    <width>640</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>ERROR Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-error.png</file>
+    <x>10</x>
+    <y>250</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>ERROR</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ERROR Status</name>
+    <text>ERROR</text>
+    <x>66</x>
+    <y>250</y>
+    <width>60</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ERROR Description</name>
+    <text>This status is set if the “error status” generated by the pump controller is true</text>
+    <x>140</x>
+    <y>250</y>
+    <width>640</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>OVER-RANGE Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-over-range.png</file>
+    <x>10</x>
+    <y>320</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>OVER-RANGE</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>OVER-RANGE Status</name>
+    <text>OVER-
+RANGE</text>
+    <x>66</x>
+    <y>320</y>
+    <width>60</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>OVER-RANGE Description</name>
+    <text>This status is set if the actual pressure is too high for the pump’s nominal operating range.
+Pressure display is the over-range pressure given by the hardware manufacturer (in mbar).</text>
+    <x>140</x>
+    <y>320</y>
+    <width>640</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>UNDER-RANGE Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-under-range.png</file>
+    <x>10</x>
+    <y>390</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>UNDER-RANGE</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>UNDER-RANGE Status</name>
+    <text>UNDER-
+RANGE</text>
+    <x>66</x>
+    <y>390</y>
+    <width>60</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>UNDER-RANGE Description</name>
+    <text>This status is set if the actual pressure is too low for the pump’s nominal operating range.
+Pressure display is the under-range pressure given by the hardware manufacturer (in mbar).</text>
+    <x>140</x>
+    <y>390</y>
+    <width>640</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>INVALID Symbol</name>
+    <file>$(vacSYMBOLS)/$(vacDEV)/$(vacDEV)-invalid.png</file>
+    <x>10</x>
+    <y>460</y>
+    <width>50</width>
+    <height>50</height>
+    <tooltip>INVALID</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>INVALID Status</name>
+    <text>INVALID</text>
+    <x>66</x>
+    <y>460</y>
+    <width>60</width>
+    <height>50</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>INVALID Description</name>
+    <text>This status is set if none of the above is applicable</text>
+    <x>140</x>
+    <y>460</y>
+    <width>640</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_valve.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_valve.bob
index ff9e8dc52191c6b6d112d40c0570f37691f3f817..9b69cad7b03faa843efdca9155c19f66f50724b5 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_valve.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/LEGEND/legend_valve.bob
@@ -4,7 +4,6 @@
   <macros>
     <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
     <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
-    <vacDEV>vva</vacDEV>
     <vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
   </macros>
   <width>410</width>
@@ -91,19 +90,7 @@ sec-subsec:dis-dev-IDX</tooltip>
       <y>3</y>
       <width>92</width>
       <height>92</height>
-      <background_color>
-        <color name="WHITE" red="255" green="255" blue="255">
-        </color>
-      </background_color>
       <actions>
-        <action type="open_display">
-          <file>$(WIDGET_ROOT)/COMMON/LEGEND/legend_valve.bob</file>
-          <macros>
-            <TITLE>VVA - Angle Valve</TITLE>
-          </macros>
-          <target>standalone</target>
-          <description>Open Legend</description>
-        </action>
       </actions>
       <tooltip></tooltip>
       <border_alarm_sensitive>false</border_alarm_sensitive>