diff --git a/indra/newview/app_settings/trees.xml b/indra/newview/app_settings/trees.xml
index 213ee85fc7..274b17377a 100644
--- a/indra/newview/app_settings/trees.xml
+++ b/indra/newview/app_settings/trees.xml
@@ -9,7 +9,7 @@
     <tree name="Palm 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" />
     <tree name="Cypress 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" />
     <tree name="Cypress 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" />
-    <tree name="Pine 2" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" />
+    <tree name="Pine 2" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="28.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" />
     <tree name="Plumeria" species_id="10" texture_id="6de37e4e-7029-61f5-54b8-f5e63f983f58" droop="8.0" twist="7.0" branches="3.0" depth="2" scale_step="0.6" trunk_depth="0" branch_length="3.0" trunk_length="0.1" leaf_scale="20" billboard_scale="10.0" billboard_ratio="1.35" trunk_aspect="0.10" branch_aspect="0.075" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.85" repeat_z="2" />
     <tree name="Winter Pine 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" />
     <tree name="Winter Aspen" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" />
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 6a71edb1a8..734bd384b3 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -494,7 +494,7 @@
      reference="Black" />
     <color
      name="ContextSilhouetteColor"
-     reference="EmphasisColor" />
+     reference="Yellow" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png
index 414f4509c6..dad2baf7c2 100644
Binary files a/indra/newview/skins/default/textures/containers/Accordion_Off.png and b/indra/newview/skins/default/textures/containers/Accordion_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png
index 5416d73310..090b05d84c 100644
Binary files a/indra/newview/skins/default/textures/containers/Accordion_Over.png and b/indra/newview/skins/default/textures/containers/Accordion_Over.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index bb3228d58e..a9ce8e42bf 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -72,7 +72,7 @@ background_visible="true"
     follows="all"
     layout="topleft"
     name="profile_accordion"
-    height="549"
+    height="505"
     width="313">
      <accordion_tab
       expanded="true"
@@ -83,7 +83,7 @@ background_visible="true"
     <scroll_container
      color="SL-Background_66"
      follows="all"
-     height="549"
+     height="650"
      min_height="300"
      layout="topleft"
      left="8"
@@ -97,7 +97,7 @@ background_visible="true"
      follows="left|top|right"
      layout="topleft"
      top="0"
-     height="549"
+     height="650"
      min_height="300"
      left="0"
      width="292">
@@ -214,7 +214,7 @@ background_visible="true"
              left="10"
              name="2nd_life_pic"
              top_pad="0"
-             width="302" />
+             width="275" />
            <icon
            height="175"
            image_name="spacer24.tga"
@@ -231,7 +231,7 @@ background_visible="true"
        length="1"
        follows="left|top|right"
        font="SansSerifSmall"
-       height="112"
+       height="240"
        layout="topleft"
        left="10"
        top_pad="-10"
@@ -339,7 +339,7 @@ background_visible="true"
     <scroll_container
      color="SL-Background_66"
      follows="all"
-     height="457"
+     height="650"
      min_height="300"
      layout="topleft"
      left="8"
@@ -353,7 +353,7 @@ background_visible="true"
       follows="left|top|right"
       layout="topleft"
       top="0"
-      height="457"
+      height="650"
      min_height="300"
          left="0"
          width="292">
@@ -376,7 +376,7 @@ background_visible="true"
              left="10"
              name="real_world_pic"
              top_pad="0"
-             width="282" />
+             width="275" />
            <icon
            height="175"
            image_name="spacer24.tga"
@@ -393,7 +393,7 @@ background_visible="true"
        length="1"
        follows="left|top|right"
        font="SansSerifSmall"
-       height="112"
+       height="240"
        layout="topleft"
        left="10"
        top_pad="-10"
@@ -415,7 +415,7 @@ background_visible="true"
        text_color="White"
        top_pad="10"
        width="100">
-          Homepage:
+          Web Page:
       </text>
       <line_editor
        follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index b8656c358a..9f224d5640 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -79,7 +79,34 @@
                left="10"
                name="2nd_life_pic"
                top="0"
-               width="282" />
+               width="275" />           
+             <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="4"
+             name="About_sl_text"
+             text_color="white"
+             top_pad="0"
+             value="About:"
+             width="100" />
+              <expandable_text
+               follows="left|top|right"
+               height="240"
+               layout="topleft"
+               left="5"
+               textbox.max_length="512"
+               textbox.show_context_menu="true"
+               name="sl_description_edit"
+               top_pad="0"
+               allow_scroll="true"
+               translate="false"
+               width="280"
+               expanded_bg_visible="true"
+               expanded_bg_color="SL-Background_Light">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
             <text
              left="4"
              follows="left|top"
@@ -106,9 +133,8 @@
              v_pad="0"
              value="05/31/2376"
              width="280"
-             word_wrap="true" />
-            <text
- 
+             word_wrap="true" />
+            <text
              follows="left|top"
              font.style="BOLD"
              height="15"
@@ -118,7 +144,7 @@
              top_pad="12"
              value="Account Status:"
              width="280"
-             word_wrap="true" />
+             word_wrap="true" /> 
             <text_editor
              allow_scroll="false"
              bg_visible="false"
@@ -166,32 +192,7 @@
                use_ellipses="true" 
                width="300" />
             </panel>
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="About_sl_text"
-             text_color="white"
-             top_pad="0"
-             value="About:"
-             width="100" />
-              <expandable_text
-               follows="left|top|right"
-               height="170"
-               layout="topleft"
-               left="5"
-               textbox.max_length="512"
-               textbox.show_context_menu="true"
-               name="sl_description_edit"
-               top_pad="0"
-               translate="false"
-               width="290"
-               expanded_bg_visible="true"
-               expanded_bg_color="SL-Background_Light">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>
+
             <!--
             <text
              follows="left|top"
@@ -215,7 +216,7 @@
             textbox.show_context_menu="true"
             top_pad="0"
             translate="false"
-            width="290"
+            width="280"
             expanded_bg_visible="true"
             expanded_bg_color="SL-Background_Light">
               Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
@@ -236,13 +237,13 @@
          left="0"
          name="profile_rl_scroll"
          opaque="true"
-         height="420"
+         height="650"
          width="313"
          top="0">
            <panel
             layout="topleft"
             follows="left|top|right"
-            height="420"
+            height="650"
             name="profile_rl_scroll_panel"
             top="0"
             left="0"
@@ -253,26 +254,16 @@
                enabled="false"
                fallback_image="Generic_Person_Large"
                follows="top|left"
-               height="144"
+               height="225"
                layout="topleft"
-               left="0"
+               left="10"
                name="real_world_pic"
-               top="10"
-               width="154" />
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="About_rl_text"
-             text_color="white"
-             top_pad="-15"
-             value="About:"
-             width="290" />
+               top="0"
+               width="275" />
               <expandable_text
-               follows="left|top|right"
-               height="220"
+               follows="left|top|right"
+               allow_scroll="false"
+               height="240"
                layout="topleft"
                left="5"
                top_pad="-3"
@@ -280,7 +271,7 @@
                textbox.show_context_menu="true"
                name="fl_description_edit"
                translate="false"
-               width="290"
+               width="280"
                expanded_bg_visible="true"
                expanded_bg_color="SL-Background_Light">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -294,8 +285,8 @@
              name="homepage_text"
              text_color="white"
              top_pad="3"
-             value="Homepage:"
-             width="290" />
+             value="Web page:"
+             width="280" />
               <text
               follows="left|top"
               height="15"
@@ -305,7 +296,7 @@
               top_pad="2"
               translate="false"
               value="blank"
-              width="290"
+              width="280"
               word_wrap="false"
               use_ellipses="true" />
             </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 2fbf2a9dd5..b76c995074 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -80,6 +80,33 @@
                name="2nd_life_pic"
                top="0"
                width="275" />
+            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="4"
+             name="About_sl_text"
+             text_color="White"
+             top_pad="0"
+             value="About:"
+             width="280" />
+            <expandable_text
+               allow_scroll="true"
+               follows="left|top|right"
+               height="240"
+               layout="topleft"
+               left="5"
+               textbox.max_length="512"
+               textbox.show_context_menu="true"
+               name="sl_description_edit"
+               top_pad="3"
+               translate="false"
+               width="280"
+               expanded_bg_visible="true"
+               expanded_bg_color="SL-Background_Light">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>              
             <text
              left="4"
              follows="left|top"
@@ -179,7 +206,7 @@
              width="280" />
             <expandable_text
             follows="all"
-            height="120"
+            height="160"
             layout="topleft"
             left="5"
             name="sl_groups"
@@ -193,34 +220,7 @@
             allow_scroll="false"
             expanded_bg_color="SL-Background_Light">
               Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
-            </expandable_text>              
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="About_sl_text"
-             text_color="White"
-             top_pad="0"
-             value="About:"
-             width="280" />
-            <expandable_text
-               allow_scroll="false"
-               follows="left|top|right"
-               height="300"
-               layout="topleft"
-               left="5"
-               textbox.max_length="512"
-               textbox.show_context_menu="true"
-               name="sl_description_edit"
-               top_pad="3"
-               translate="false"
-               width="280"
-               expanded_bg_visible="true"
-               expanded_bg_color="SL-Background_Light">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>   
+            </expandable_text>               
           </panel>
         </scroll_container>
     </accordion_tab>
@@ -254,26 +254,15 @@
                enabled="false"
                fallback_image="Generic_Person_Large"
                follows="top|left"
-               height="144"
+               height="225"
                layout="topleft"
-               left="0"
+               left="10"
                name="real_world_pic"
-               top="10"
-               width="154" />
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="About_rl_text"
-             text_color="White"
-             top_pad="-15"
-             value="About:"
-             width="309" />
+               top="00"
+               width="275" />
               <expandable_text
                follows="left|top|right"
-               height="220"
+               height="240"
                layout="topleft"
                left="5"
                top_pad="-3"
@@ -281,7 +270,7 @@
                textbox.show_context_menu="true"
                name="fl_description_edit"
                translate="false"
-               width="290"
+               width="280"
                expanded_bg_visible="true"
                expanded_bg_color="SL-Background_Light">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -295,8 +284,8 @@
              name="homepage_text"
              text_color="White"
              top_pad="3"
-             value="Homepage:"
-             width="290" />
+             value="Web page:"
+             width="280" />
               <text
               follows="left|top"
               height="15"
@@ -306,7 +295,7 @@
               top_pad="2"
               translate="false"
               value="blank"
-              width="290"
+              width="280"
               word_wrap="false"
               use_ellipses="true" />
           </panel>