diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index fd286d1462..855659e394 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -35,13 +35,22 @@
                     width="120">
                 Sun & Stars
             </text>
+            <check_box
+                    control_name="sunbeacon"
+                    width="60"
+                    height="16"
+                    label="Show Beacon"
+                    layout="topleft"
+                    name="sunbeacon" 
+                    top_delta="0"
+                    left="180"/>  
             <text
                     name="position_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="10"
-                    top_delta="25"
+                    left="20"
+                    top_delta="20"
                     width="100">
                 Position:
             </text>
@@ -49,7 +58,7 @@
                     name="sun_rotation"
                     follows="left|top"
                     left_delta="0"
-                    top_delta="20"
+                    top_delta="15"
                     height="150"
                     width="150"
                     thumb_mode="sun" />
@@ -59,55 +68,46 @@
                     height="10"
                     layout="topleft"
                     left_delta="160"
-                    top_delta="-20"
+                    top_delta="-15"
                     width="200">
-                Image:
+                Image and scale:
             </text>
             <texture_picker
                     height="123"
                     layout="topleft"
                     left_delta="5"
                     name="sun_image"
-                    top_pad="10"
+                    top_pad="5"
                     width="100"/>
-            <text
-                    name="scale_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="-5"
-                    top_delta="110"
-                    width="80">
-                Scale:
-            </text>
-            <slider
+            <slider_bar
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="100"
+                    top_delta="0"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0.25"
                     max_val="20"
                     name="sun_scale"
-                    top_delta="15"
-                    width="130"
-                    can_edit_text="true"/>
+                    orientation="vertical"
+                    width="16"
+                    can_edit_text="false"/>
             <text
                     name="color_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="65"
-                    top_delta="20"
+                    left="180"
+                    top_pad="5"
                     width="80">
                 Color:
             </text>
             <color_swatch
                     can_apply_immediately="true"
                     follows="left|top"
-                    height="37"
+                    height="25"
                     label_height="0"
                     layout="topleft"
                     left_delta="5"
@@ -119,9 +119,9 @@
             name="sun_azimuth_label"
             height="10"
             layout="topleft"
-            left_delta="-235"
-            top_delta="-3"
-            width="200">
+            left="20"
+            top_delta="45"
+            width="80">
             Azimuth:
           </text>
           <slider
@@ -131,11 +131,11 @@
             increment="0.01"
             initial_value="0"
             layout="topleft"
-            left_delta="5"
+            left_pad="5"
             min_val="0"
             max_val="359.99"
             name="sun_azimuth"
-            top_delta="13"
+            top_delta="0"
             width="215"
             can_edit_text="true"/>
           <text
@@ -143,9 +143,9 @@
             name="sun_elevation_label"
             height="10"
             layout="topleft"
-            left_delta="-5"
+            left_delta="-85"
             top_delta="22"
-            width="200">
+            width="80">
             Elevation:
           </text>
           <slider
@@ -155,11 +155,11 @@
             increment="0.01"
             initial_value="0"
             layout="topleft"
-            left_delta="5"
+            left_pad="5"
             min_val="-90"
             max_val="90"
             name="sun_elevation"
-            top_delta="13"
+            top_delta="0"
             width="215"
             can_edit_text="true"/>
             <text
@@ -167,9 +167,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left_delta="-85"
                     top_delta="22"
-                    width="200">
+                    width="80">
                 Glow Focus:
             </text>
             <slider
@@ -179,11 +179,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="-2"
                     max_val="2"
                     name="glow_focus"
-                    top_delta="13"
+                    top_delta="0"
                     width="215"
                     can_edit_text="true"/>
             <text
@@ -191,9 +191,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left_delta="-85"
                     top_delta="22"
-                    width="200">
+                    width="80">
                 Glow Size:
             </text>
             <slider
@@ -203,11 +203,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0"
                     max_val="1.99"
                     name="glow_size"
-                    top_delta="13"
+                    top_delta="0"
                     width="215"
                     can_edit_text="true"/>
             <text
@@ -215,9 +215,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left_delta="-85"
                     top_delta="22"
-                    width="200">
+                    width="80">
                 Star Brightness:
             </text>
             <slider
@@ -227,88 +227,69 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0"
                     max_val="500"
                     name="star_brightness"
-                    top_delta="13"
+                    top_delta="0"
                     width="215"
-                    can_edit_text="true"/>
-                    
-            <check_box
-                    control_name="sunbeacon"
-                    follows="left|top"
-                    layout="topleft"
-                    width="60"
-                    height="16"
-                    label="Show Beacon"
-                    name="sunbeacon"
-                    top_pad="5"
-                    left_delta="-8"/>
-                    
+                    can_edit_text="true"/>                    
         </layout_panel>
         <layout_panel
-                name="moon_layout_main"
-                border="false"
+                name="moon_layout"
+                border="true"
                 bevel_style="in"
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
                 height="400">
-            <layout_stack 
-                    name="moon_ls"
-                    left="5"
-                    top="5"
-                    right="-5"
-                    bottom="-5"
-                    follows="left|top|right|bottom"
-                    orientation="vertical">
-                <layout_panel
-                        border="true"
-                        bevel_style="in"
-                        auto_resize="true"
-                        user_resize="false"
-                        visible="true"
-                        name="moon_layout"
-                        height="220">
-                    <text
-                            name="moon_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="15"
-                            top_pad="15"
-                            font="SansSerifBold"
-                            width="80">
-                        Moon
-                    </text>
-                    <text
-                            name="position_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="10"
-                            top_delta="25"
-                            width="100">
-                        Position:
-                    </text>
+                <text
+                        name="moon_label"
+                        follows="left|top"
+                        height="10"
+                        layout="topleft"
+                        left_delta="15"
+                        top_pad="15"
+                        font="SansSerifBold"
+                        width="120">
+                Moon
+                </text>
+                <check_box
+                        control_name="moonbeacon"
+                        width="60"
+                        height="16"
+                        label="Show Beacon"
+                        layout="topleft"
+                        name="moonbeacon" 
+                        top_delta="0"
+                        left="180"/>  
+                <text
+                        name="position_label"
+                        follows="left|top"
+                        height="10"
+                        layout="topleft"
+                        left="20"
+                        top_delta="20"
+                        width="100">
+                Position:
+                </text>
                     <sun_moon_trackball
                             name="moon_rotation"
                             follows="left|top"
                             left_delta="0"
-                            top_delta="20"
+                            top_delta="15"
                             height="150"
                             width="150"
                             thumb_mode="moon" />
                     <text
-                            name="image_label"
+                            name="moon_image_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
                             left_delta="160"
-                            top_delta="-20"
+                            top_delta="-15"
                             width="200">
-                        Image:
+                        Image and scale:
                     </text>
                     <texture_picker
                             height="123"
@@ -317,38 +298,29 @@
                             name="moon_image"
                             top_pad="10"
                             width="100"/>
-                    <text
-                            name="scale_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="-5"
-                            top_delta="110"
-                            width="80">
-                        Scale:
-                    </text>
-                    <slider
+                    <slider_bar
                             decimal_digits="2"
                             follows="left|top"
-                            height="16"
+                            height="100"
+                            top_delta="0"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
-                            left_delta="5"
+                            left_pad="5"
                             min_val="0.25"
                             max_val="20"
                             name="moon_scale"
-                            top_delta="15"
-                            width="130"
-                            can_edit_text="true"/>
+                            orientation="vertical"
+                            width="16"
+                            can_edit_text="false"/>
                   <text
                     follows="left|top"
                     name="moon_azimuth_label"
                     height="10"
                     layout="topleft"
-                    left_delta="-170"
-                    top_delta="32"
-                    width="200">
+                    left="20"
+                    top_delta="160"
+                    width="80">
                     Azimuth:
                   </text>
                   <slider
@@ -358,11 +330,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0"
                     max_val="359.99"
                     name="moon_azimuth"
-                    top_delta="13"
+                    top_delta="0"
                     width="215"
                     can_edit_text="true"/>
                   <text
@@ -370,9 +342,9 @@
                     name="moon_elevation_label"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left_delta="-85"
                     top_delta="22"
-                    width="200">
+                    width="80">
                     Elevation:
                   </text>
                   <slider
@@ -382,11 +354,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="-90"
                     max_val="90"
                     name="moon_elevation"
-                    top_delta="13"
+                    top_delta="0"
                     width="215"
                     can_edit_text="true"/>
                   <text
@@ -394,9 +366,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left_delta="-85"
                     top_delta="22"
-                    width="200">
+                    width="80">
                     Brightness:
                   </text>
                   <slider
@@ -406,24 +378,13 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0.0"
                     max_val="1.0"
                     name="moon_brightness"
-                    top_delta="13"
+                    top_delta="0"
                     width="215"
-                    can_edit_text="true"/>
-                  <check_box
-                        control_name="moonbeacon"
-                        follows="left|top"
-                        layout="topleft"
-                        width="60"
-                        height="16"
-                        label="Show Beacon"
-                        name="moonbeacon" 
-                        top_pad="5"
-                        left_delta="-8"/>
-                            
+                    can_edit_text="true"/>                           
                 </layout_panel>
             </layout_stack>
         </layout_panel>