diff --git a/NON-APPROVED/TS2/pss/PSS TS2 Layout.png b/NON-APPROVED/TS2/pss/PSS TS2 Layout.png
index ae9ad164d6922242468934e6cf8f0f6346175e47..cf0b07d6b8293a27d02cfec1bd99b37efb4f0dc9 100644
Binary files a/NON-APPROVED/TS2/pss/PSS TS2 Layout.png and b/NON-APPROVED/TS2/pss/PSS TS2 Layout.png differ
diff --git a/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob b/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
index bd734d33379fc4448805c20432b8b1b3ca92e07c..be08bfdaa33c3aca9ebb8d6efebc699b32d8b712 100644
--- a/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
+++ b/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
@@ -79,7 +79,7 @@
         <height>84</height>
         <style>3</style>
         <widget type="led" version="2.0.0">
-          <name>PermitIssued</name>
+          <name>PermitLLRF</name>
           <pv_name>$(P):PermitLLRF</pv_name>
           <x>10</x>
           <y>29</y>
@@ -152,6 +152,21 @@
         <width>970</width>
         <height>600</height>
         <style>3</style>
+        <widget type="rectangle" version="2.0.0">
+          <name>MAD</name>
+          <x>833</x>
+          <y>406</y>
+          <width>50</width>
+          <height>121</height>
+          <line_color>
+            <color name="GRAY-BORDER" red="121" green="121" blue="121">
+            </color>
+          </line_color>
+          <background_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </background_color>
+        </widget>
         <widget type="picture" version="2.0.0">
           <name>Area Layout</name>
           <file>PSS TS2 Layout.png</file>
@@ -185,20 +200,20 @@
           <transparent>true</transparent>
         </widget>
         <widget type="embedded" version="2.0.0">
-          <name>Radiation Monitor</name>
+          <name>AGM-003</name>
           <macros>
             <AGM>003</AGM>
             <R_IDX>1</R_IDX>
           </macros>
           <file>embedded_displays/rad.bob</file>
-          <x>34</x>
-          <y>63</y>
+          <x>833</x>
+          <y>443</y>
           <width>50</width>
           <height>50</height>
           <transparent>true</transparent>
         </widget>
         <widget type="embedded" version="2.0.0">
-          <name>Radiation Monitor</name>
+          <name>AGM-002</name>
           <macros>
             <AGM>002</AGM>
             <R_IDX>2</R_IDX>
@@ -257,12 +272,12 @@
           <y>173</y>
           <width>52</width>
           <height>233</height>
-          <off_label>Open</off_label>
+          <off_label>MAD</off_label>
           <off_color>
             <color red="51" green="51" blue="51">
             </color>
           </off_color>
-          <on_label>Closed</on_label>
+          <on_label>MAD</on_label>
           <on_color>
             <color red="51" green="51" blue="51">
             </color>
@@ -272,7 +287,7 @@
             </font>
           </font>
           <foreground_color>
-            <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+            <color red="220" green="130" blue="10">
             </color>
           </foreground_color>
           <square>true</square>
diff --git a/NON-APPROVED/TS2/pss/embedded_displays/rad.bob b/NON-APPROVED/TS2/pss/embedded_displays/rad.bob
index 1a8ffb527d33601769fa6c039f413e8297171d9d..bb3a5a490b61d66b50d7ae026014d1aea3a7bbc0 100644
--- a/NON-APPROVED/TS2/pss/embedded_displays/rad.bob
+++ b/NON-APPROVED/TS2/pss/embedded_displays/rad.bob
@@ -31,6 +31,25 @@
       </script>
     </scripts>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label shadow</name>
+    <text>AGM-
+$(AGM)</text>
+    <x>2</x>
+    <y>2</y>
+    <width>48</width>
+    <height>48</height>
+    <font>
+      <font name="SMALL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-DARK" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>AGM-
@@ -38,11 +57,11 @@ $(AGM)</text>
     <width>50</width>
     <height>50</height>
     <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      <font name="SMALL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="14.0">
       </font>
     </font>
     <foreground_color>
-      <color red="255" green="255" blue="255" alpha="200">
+      <color red="245" green="245" blue="245">
       </color>
     </foreground_color>
     <horizontal_alignment>1</horizontal_alignment>
diff --git a/NON-APPROVED/TS2/pss/symbols/PSS TS2 Layout.xcf b/NON-APPROVED/TS2/pss/symbols/PSS TS2 Layout.xcf
index c531842505e07f41f4d9c62f68934a470d51fce5..97829b8fdc52d2dc23132cc1b0f9025d34cbb8af 100644
Binary files a/NON-APPROVED/TS2/pss/symbols/PSS TS2 Layout.xcf and b/NON-APPROVED/TS2/pss/symbols/PSS TS2 Layout.xcf differ