diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index afbbeb4833..09b1735e04 100644
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -8,89 +8,56 @@
  save_visibility="true"
  single_instance="true"
  title="Beacons"
- width="250">
+ width="240">
     <panel
      follows="left|top|right|bottom"
      height="200"
      layout="topleft"
      left="10"
      name="beacons_panel"
-     top="15"
+     top="20"
      width="230">
+        <text
+         follows="all"
+         height="16"
+         font="SansSerif"
+         name="label_show"
+         text_color="White"
+         type="string">
+            Show:
+         </text>
         <check_box
-         bottom_delta="33"
-         control_name="scripttouchbeacon"
-         label="Scripted Objects with Touch Only"
-         layout="topleft"
-         name="touch_only" >
-          <check_box.commit_callback
-           function="Beacons.UICheck" />
-        </check_box>
-        <check_box
-         bottom_delta="20"
-         control_name="scriptsbeacon"
-         label="Scripted Objects"
-         layout="topleft"
-         name="scripted">
-          <check_box.commit_callback
-           function="Beacons.UICheck" />
-        </check_box>
-        <check_box
-         bottom_delta="20"
-         control_name="physicalbeacon"
-         label="Physical Objects"
-         layout="topleft"
-         name="physical" >
-          <check_box.commit_callback
-           function="Beacons.UICheck" />
-        </check_box>
-        <check_box
-         bottom_delta="20"
-         control_name="soundsbeacon"
-         label="Sound Sources"
-         layout="topleft"
-         name="sounds" >
-          <check_box.commit_callback
-           function="Beacons.UICheck" />
-        </check_box>
-        <check_box
-         bottom_delta="20"
-         control_name="particlesbeacon"
-         label="Particle Sources"
-         layout="topleft"
-         name="particles" >
-          <check_box.commit_callback
-           function="Beacons.UICheck" />
-        </check_box>
-        <check_box
-         bottom_delta="20"
-         control_name="renderhighlights"
-         label="Render Highlights"
-         layout="topleft"
-         name="highlights" >
-          <check_box.commit_callback
-           function="Beacons.UICheck" />
-        </check_box>
-        <check_box
-         bottom_delta="20"
          control_name="renderbeacons"
-         label="Render Beacons"
+         height="16"
+         width="100"
+         label="Beacons"
          layout="topleft"
          name="beacons" >
           <check_box.commit_callback
            function="Beacons.UICheck" />
+        </check_box>
+         <check_box
+         control_name="renderhighlights"
+         height="16"
+         left_pad="10"
+         label="Highlights"
+         layout="topleft"
+         name="highlights" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
         </check_box>
         <text
          type="string"
          length="1"
          follows="left|top"
-         height="12"
+         height="16"
          layout="topleft"
-         left="5"
+         left="20"
+         tool_tip="Beacon Width"
          name="beacon_width_label"
-         top="171"
+         top_pad="3"
          width="128">
-            Beacon Width:
+            Width:
         </text>
         <slider
          control_name="DebugBeaconLineWidth"
@@ -99,11 +66,71 @@
          increment="1"
          initial_value="1"
          layout="topleft"
-         left="30"
          max_val="16"
          min_val="1"
          name="beacon_width"
-         top="187"
-         width="185" />
+         top_pad="0"
+         width="180" />
+         <text
+         follows="all"
+         height="16"
+         font="SansSerif"
+         left="0"
+         top_pad="5"
+         name="label_objects"
+         text_color="White"
+         type="string">
+           For these objects:
+         </text>
+         <check_box
+         control_name="physicalbeacon"
+         height="16"
+         left="0"
+         label="Physical"
+         layout="topleft"
+         name="physical" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="scriptsbeacon"
+         height="16"
+         left="0"
+         label="Scripted"
+         layout="topleft"
+         name="scripted">
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+         <check_box
+         control_name="scripttouchbeacon"
+         height="16"
+         top_pad="4"
+         left="20"
+         label="Touch only"
+         layout="topleft"
+         name="touch_only" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="soundsbeacon"
+         height="16"
+         label="Sound sources"
+         layout="topleft"
+         name="sounds" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="particlesbeacon"
+         height="16"
+         label="Particle sources"
+         layout="topleft"
+         name="particles" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+
     </panel>
 </floater>