diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index e71578fdbb..01fbdd8528 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -6,11 +6,11 @@
         save_rect="false"
         title="Edit Day Cycle"
         width="705"
-        height="700"
+        height="620"
         min_width="705"
-        min_height="700"
+        min_height="300"
         single_instance="true" 
-        can_resize="false">
+        can_resize="true">
 
     <!-- obsolete?, add as hint for 'save' button? -->
     <string name="title_new">Create a New Day Cycle</string>
@@ -30,7 +30,7 @@
     <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
-            height="700"
+            height="620"
             follows="all"
             animate="false"
             top="0"
@@ -520,14 +520,14 @@
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
                         user_resize="false"
-                        height="420"
+                        height="320"
                         width="700"
                         min_height="0"
                         visible="false">
                     <tab_container
                             follows="all"
                             halign="left"
-                            height="420"
+                            height="320"
                             layout="topleft"
                             left="0"
                             name="water_tabs"
@@ -550,14 +550,14 @@
                 <layout_panel name="frame_settings_sky"
                         auto_resize="true"
                         user_resize="false"
-                        height="420"
+                        height="320"
                         width="700"
                         min_height="0"
                         visible="true">
                     <tab_container
                             follows="all"
                             halign="left"
-                            height="420"
+                            height="320"
                             visible="true"
                             layout="topleft"
                             left="0"
@@ -569,6 +569,7 @@
                             width="700">
                         <panel
                                 border="true"
+                                height="420"
                                 class="panel_settings_atmos"
                                 filename="panel_settings_sky_atmos.xml"
                                 label="Atmosphere &amp; Lighting"
@@ -610,7 +611,7 @@
             </layout_stack>
         </layout_panel>
         <layout_panel name="buttons"
-                auto_resize="false"
+                auto_resize="true"
                 user_resize="false"
                 height="26"
                 min_height="26"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 4e751857ae..acab8bdc24 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -30,7 +30,7 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="15"
+                    left_pad="15"
                     top_pad="15"
                     width="100">
                 Ambient Color:
@@ -113,9 +113,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="15"
-                            top_pad="15"
-                            width="200">
+                            left="5"
+                            top_pad="10"
+                            width="100">
                         Haze Horizon:
                     </text>
                     <slider
@@ -125,11 +125,11 @@
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
-                            left_delta="5"
+                            left_pad="5"
                             min_val="0"
                             max_val="5"
                             name="haze_horizon"
-                            top_delta="20"
+                            top_delta="0"
                             width="207"
                             can_edit_text="true"/>
                     <text
@@ -137,9 +137,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
+                            left="5"
+                            top_pad="15"
+                            width="100">
                         Haze Density:
                     </text>
                     <slider
@@ -149,11 +149,11 @@
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
-                            left_delta="5"
+                            left_pad="5"
                             min_val="0"
                             max_val="5"
                             name="haze_density"
-                            top_delta="20"
+                            top_delta="0"
                             width="207"
                             can_edit_text="true"/>
                     <text
@@ -161,9 +161,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
+                            left="5"
+                            top_pad="15"
+                            width="100">
                         Moisture Level:
                     </text>
                      <slider
@@ -172,8 +172,8 @@
                             height="14"
                             increment="0.001"
                             initial_value="0"
-                            left_delta="5"
-                            top_delta="20"
+                            left_pad="5"
+                            top_delta="0"
                             layout="topleft"
                             min_val="0"
                             max_val="1"
@@ -185,9 +185,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
+                            left="5"
+                            top_pad="15"
+                            width="100">
                         Droplet Radius:
                     </text>
                     <slider
@@ -196,8 +196,8 @@
                             height="14"
                             increment="0.01"
                             initial_value="0"
-                            left_delta="5"
-                            top_delta="20"
+                            left_pad="5"
+                            top_delta="0"
                             layout="topleft"
                             min_val="5.0"
                             max_val="1000.0"
@@ -209,9 +209,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
+                            left="5"
+                            top_pad="15"
+                            width="100">
                         Ice Level:
                     </text>
                     <slider
@@ -220,37 +220,14 @@
                             height="14"
                             increment="0.001"
                             initial_value="0"
-                            left_delta="5"
-                            top_delta="20"
+                            left_pad="5"
                             layout="topleft"
+                            top_delta="0"
                             min_val="0"
                             max_val="1"
                             name="ice_level"
                             width="207"
                             can_edit_text="true"/>
-                    <text
-                            name="scene_gamma_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
-                        Scene Gamma:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
-                            max_val="20"
-                            name="scene_gamma"
-                            top_delta="20"
-                            width="207"
-                            can_edit_text="true"/>
                 </layout_panel>            
                 <layout_panel
                         name="right_lp"
@@ -265,9 +242,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="15"
-                            top_pad="15"
-                            width="200">
+                            left="5"
+                            top_pad="10"
+                            width="100">
                         Density Multiplier:
                     </text>
                     <slider
@@ -277,11 +254,11 @@
                             increment="0.0001"
                             initial_value="0"
                             layout="topleft"
-                            left_delta="5"
+                            left_pad="5"
                             min_val="0.0001"
                             max_val="2"
                             name="density_multip"
-                            top_delta="20"
+                            top_delta="0"
                             width="219"
                             can_edit_text="true"/>
                     <text
@@ -289,9 +266,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
+                            left="5"
+                            top_pad="15"
+                            width="100">
                         Distance Multiplier:
                     </text>
                     <slider
@@ -301,11 +278,11 @@
                             increment="0.01"
                             initial_value="0.8"
                             layout="topleft"
-                            left_delta="5"
+                            left_pad="5"
                             min_val="0.05"
                             max_val="1000"
                             name="distance_multip"
-                            top_delta="20"
+                            top_delta="0"
                             width="219"
                             can_edit_text="true"/>
                     <text
@@ -313,9 +290,9 @@
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="200">
+                            left="5"
+                            top_pad="15"
+                            width="100">
                         Maximum Altitude:
                     </text>
                     <slider
@@ -325,13 +302,36 @@
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
-                            left_delta="5"
+                            left_pad="5"
                             min_val="0"
                             max_val="10000"
                             name="max_alt"
-                            top_delta="20"
+                            top_delta="0"
                             width="219"
                             can_edit_text="true"/>
+                            <text
+                            name="scene_gamma_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="100">
+                        Scene Gamma:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            max_val="20"
+                            name="scene_gamma"
+                            top_delta="0"
+                            width="207"
+                            can_edit_text="true"/>
                 </layout_panel>            
             </layout_stack>                
         </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 9bdfa94a33..7fd7c063bf 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -25,34 +25,14 @@
                 user_resize="false"
                 visible="true"
                 height="75">
-            <text
-                    name="cloud_color_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="15"
-                    top_pad="15"
-                    width="80">
-                Cloud Color:
-            </text>
-            <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="37"
-                    label_height="0"
-                    layout="topleft"
-                    left_delta="0"
-                    name="cloud_color"
-                    top_pad="5"
-                    width="60" />
             <text
                     name="cloud_coverage_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="0"
-                    top_delta="47"
-                    width="200">
+                    left ="5"
+                    top="15"
+                    width="100">
                 Cloud Coverage:
             </text>
             <slider
@@ -62,11 +42,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0"
                     max_val="1"
                     name="cloud_coverage"
-                    top_delta="20"
+                    top_delta="0"
                     width="214"
                     can_edit_text="true"/>
             <text
@@ -74,9 +54,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
-                    top_delta="25"
-                    width="200">
+                    left="5"
+                    top_delta="15"
+                    width="100">
                 Cloud Scale:
             </text>
             <slider
@@ -86,11 +66,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0.01"
                     max_val="3"
                     name="cloud_scale"
-                    top_delta="20"
+                    top_delta="0"
                     width="214"
                     can_edit_text="true"/>
             <text
@@ -98,9 +78,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
-                    top_delta="25"
-                    width="200">
+                    left="5"
+                    top_delta="15"
+                    width="100">
                 Cloud Variance:
             </text>
             <slider
@@ -110,11 +90,11 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_pad="5"
                     min_val="0"
                     max_val="1.0"
                     name="cloud_variance"
-                    top_delta="20"
+                    top_delta="0"
                     width="214"
                     can_edit_text="true"/>
             <text
@@ -122,44 +102,63 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left="5"
                     top_delta="25"
                     width="200">
-                Cloud Scroll:
+                    Cloud Scroll:
             </text>
             <xy_vector
-                    follows="left|top"
+            follows="left|top"
                     name="cloud_scroll_xy"
-                    width="127"
-                    height="145"
+                    width="157"
+                    height="178"
                     visible="true"
-                    left_delta="0"
+                    left="5"
                     top_delta="21"
                     min_val_x="-30"
                     max_val_x="30"
                     min_val_y="-30"
                     max_val_y="30" 
                     logarithmic="1"/>
-
-            <text
+                <text
                     name="cloud_image_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="160"
+                    left_delta="180"
                     top_delta="-20"
                     width="200">
-                Cloud Image:
-            </text>
-            <texture_picker
-                    height="123"
-                    layout="topleft"
-                    left_delta="5"
-                    name="cloud_map"
-                    top_pad="10"
-                    width="100"/>
+                    Cloud Image:
+                </text>
+                <texture_picker
+                height="123"
+                layout="topleft"
+                left_delta="5"
+                name="cloud_map"
+                top_pad="10"
+                width="100"/>
+                <text
+                        name="cloud_color_label"
+                        follows="left|top"
+                        height="10"
+                        layout="topleft"
+                        left_delta="-5"
+                        top_pad="5"
+                        width="80">
+                    Cloud Color:
+                </text>
+                <color_swatch
+                        can_apply_immediately="true"
+                        follows="left|top"
+                        height="25"
+                        label_height="0"
+                        layout="topleft"
+                        left_delta="5"
+                        name="cloud_color"
+                        top_pad="5"
+                        width="60" />                    
         </layout_panel>
-        <layout_panel
+                <layout_panel
                 name="right_lp"
                 border="true"
                 bevel_style="in"
@@ -167,32 +166,32 @@
                 user_resize="false"
                 visible="true"
                 height="75">
-            <text
-                    name="cloud_density_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
+                <text
+                name="cloud_density_label"
+                follows="left|top"
+                height="10"
+                layout="topleft"
                     left_delta="15"
                     top_pad="15"
                     width="200">
-                Cloud Density:
-            </text>
-            <slider
-                    label="X"
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="5"
+                    Cloud Density:
+                </text>
+                <slider
+                label="X"
+                decimal_digits="2"
+                follows="left|top"
+                height="16"
+                increment="0.01"
+                initial_value="0"
+                layout="topleft"
+                left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="cloud_density_x"
                     top_delta="20"
                     width="200"
                     can_edit_text="true"/>
-            <slider
+                    <slider
                     label="Y"
                     decimal_digits="2"
                     follows="left|top"
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 2e116c3410..84bd7f0127 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
@@ -36,78 +36,87 @@
                 Sun &amp; Stars
             </text>
             <text
-                    name="position_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="10"
-                    top_delta="30"
-                    width="100">
-                Position:
-            </text>
-            <sun_moon_trackball
-                    name="sun_rotation"
-                    follows="left|top"
+            name="position_label"
+            follows="left|top"
+            height="10"
+            layout="topleft"
+            left="20"
+            top_delta="20"
+            width="100">
+            Position:
+        </text>
+        <sun_moon_trackball
+        name="sun_rotation"
+        follows="left|top"
                     left_delta="0"
-                    top_delta="20"
+                    top_delta="15"
                     height="150"
                     width="150"
                     thumb_mode="sun" />
-            <text
+                    <text
                     name="image_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
                     left_delta="160"
-                    top_delta="-20"
+                    top_delta="-15"
                     width="200">
-                Image:
-            </text>
-            <texture_picker
-                    height="123"
-                    layout="topleft"
-                    left_delta="5"
-                    name="sun_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">
+                    Image:
+                </text>
+                <texture_picker
+                height="123"
+                layout="topleft"
+                left_delta="5"
+                name="sun_image"
+                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
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="5"
-                    min_val="0.25"
-                    max_val="20"
-                    name="sun_scale"
-                    top_delta="15"
-                    width="130"
-                    can_edit_text="true"/>
-            <text
-                    name="color_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="-5"
-                    top_delta="20"
-                    width="80">
-                Color:
-            </text>
-            <color_swatch
+        </text>
+        <slider
+        decimal_digits="2"
+        follows="left|top"
+        height="16"
+        increment="0.01"
+        initial_value="0"
+        layout="topleft"
+        left_delta="5"
+        min_val="0.25"
+        max_val="20"
+        name="sun_scale"
+        top_delta="15"
+        width="130"
+        can_edit_text="true"/>
+        <check_box
+        control_name="sunbeacon"
+        width="60"
+        height="16"
+        label="Show Beacon"
+        layout="topleft"
+        name="sunbeacon" 
+        top_delta="30"
+        left="20"/>
+        <text
+        name="color_label"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="180"
+        top_delta="0"
+        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 +128,9 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-160"
-                    top_delta="27"
-                    width="200">
+                    left="20"
+                    top_delta="43"
+                    width="115">
                 Glow Focus:
             </text>
             <slider
@@ -131,21 +140,21 @@
                     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="15"
-                    width="250"
+                    top_delta="0"
+                    width="175"
                     can_edit_text="true"/>
             <text
                     name="glow_size_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left="20"
                     top_delta="22"
-                    width="200">
+                    width="115">
                 Glow Size:
             </text>
             <slider
@@ -155,21 +164,21 @@
                     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="15"
-                    width="250"
+                    top_delta="0"
+                    width="175"
                     can_edit_text="true"/>
             <text
                     name="star_brightness_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="-5"
+                    left="20"
                     top_delta="22"
-                    width="200">
+                    width="115">
                 Star Brightness:
             </text>
             <slider
@@ -179,25 +188,13 @@
                     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="15"
-                    width="250"
+                    top_delta="0"
+                    width="175"
                     can_edit_text="true"/>
-                    
-            <check_box
-                    control_name="sunbeacon"
-                    width="60"
-                    height="16"
-                    label="Show Beacon"
-                    layout="topleft"
-                    name="sunbeacon" 
-                    right="-50"
-                    bottom="-10"
-                    follows="bottom|right"/>
-                    
         </layout_panel>
         <layout_panel
                 name="moon_layout_main"
@@ -210,7 +207,7 @@
             <layout_stack 
                     name="moon_ls"
                     left="5"
-                    top="5"
+                    top="0"
                     right="-5"
                     bottom="-5"
                     follows="left|top|right|bottom"
@@ -240,7 +237,7 @@
                             height="10"
                             layout="topleft"
                             left_delta="10"
-                            top_delta="30"
+                            top_delta="20"
                             width="100">
                         Position:
                     </text>
@@ -248,7 +245,7 @@
                             name="moon_rotation"
                             follows="left|top"
                             left_delta="0"
-                            top_delta="20"
+                            top_delta="15"
                             height="150"
                             width="150"
                             thumb_mode="moon" />
@@ -293,14 +290,24 @@
                             top_delta="15"
                             width="130"
                             can_edit_text="true"/>
-                    <text
+                            <check_box
+                                    control_name="moonbeacon"
+                                    width="60"
+                                    height="16"
+                                    label="Show Beacon"
+                                    layout="topleft"
+                                    name="moonbeacon" 
+                                    top_delta="30"
+                                    left="20"
+                                    bottom="-10"/>
+                            <text
                             name="brightness_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="-5"
-                            top_delta="22"
-                            width="200">
+                            left="20"
+                            top_delta="25"
+                            width="120">
                         Brightness:
                     </text>
                     <slider
@@ -310,23 +317,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="15"
-                            width="130"
+                            top_delta="0"
+                            width="175"
                             can_edit_text="true"/>
-                <check_box
-                        control_name="moonbeacon"
-                        width="60"
-                        height="16"
-                        label="Show Beacon"
-                        layout="topleft"
-                        name="moonbeacon" 
-                        right="-50"
-                        bottom="-10"
-                        follows="bottom|right"/>
                             
                 </layout_panel>
             </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 2a18dc4296..1a763859f2 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -201,7 +201,7 @@
                         height="145"
                         visible="true"
                         left_delta="0"
-                        top_delta="21"
+                        top_delta="20"
                         min_val_x="-20"
                         max_val_x="20"
                         increment_x="0.01f"
@@ -226,7 +226,7 @@
                         height="145"
                         visible="true"
                         left_delta="0"
-                        top_delta="21"
+                        top_delta="20"
                         min_val_x="-20"
                         max_val_x="20"
                         min_val_y="-20"