Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

14 files changed, 279 insertions, 256 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 53ca0005a5..4c5d5a1b96 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -47,7 +47,7 @@
          min_height="23"
          width="310"
          top="4"
-         min_width="220"
+         min_width="216"
          name="chat_bar"
          user_resize="false"
          filename="panel_nearby_chat_bar.xml" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 5373699c02..b196d8eeb7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -56,7 +56,7 @@ background_visible="true"
      use_ellipses="true"
       width="275"
       follows="top|left|right"
-      word_wrap="true"
+      word_wrap="false"
       mouse_opaque="false"/>
     <line_editor
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 6927906d3d..66070c028d 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -8,7 +8,7 @@
  min_height="350"
  name="landmark_info"
  top="20"
- width="330">
+ width="333">
     <string
      name="title_create_landmark"
      value="Create Landmark" />
@@ -58,11 +58,11 @@
      height="23"
      image_overlay="BackArrow_Off"
      layout="topleft"
-     left="10"
+     left="11"
      name="back_btn"
      tool_tip="Back"
      tab_stop="false"
-     top="0"
+     top="4"
      width="23" />
     <text
      follows="top|left|right"
@@ -72,36 +72,36 @@
      left_pad="10"
      name="title"
      text_color="LtGray"
-     top="0"
+     top="2"
      use_ellipses="true"
      value="Place Profile"
-     width="275" />
+     width="280" />
     <scroll_container
      color="DkGray2"
      follows="all"
-     height="533"
+     height="532"
      layout="topleft"
-     left="10"
+     left="9"
      name="place_scroll"
      opaque="true"
-     top_pad="5"
-     width="313">
+     top_pad="10"
+     width="310">
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="610"
+         height="700"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="313">
+         width="285">
             <texture_picker
              enabled="false"
-             follows="top|left"
-             height="190"
+         follows="left|top|right"
+             height="197"
              layout="topleft"
-             left="10"
+             left="11"
              name="logo"
              top="10"
              width="290" />
@@ -113,29 +113,29 @@
              left="10"
              name="region_title"
              text_color="white"
-             top_pad="5"
+             top_pad="10"
              use_ellipses="true"
              value="SampleRegion"
-             width="290" />
+             width="280" />
             <text
              follows="left|top|right"
              height="14"
              layout="topleft"
              left="10"
              name="parcel_title"
-             top_pad="4"
+             top_pad="10"
              use_ellipses="true"
              value="SampleParcel, Name Long (145, 228, 26)"
-             width="285" />
+             width="280" />
             <expandable_text
              follows="left|top|right"
              height="50"
              layout="topleft"
-             left="5"
+             left="10"
              name="description"
              top_pad="10"
              value="Du waltz die spritz"
-             width="300" />
+             width="280" />
             <icon
              follows="top|left"
              height="16"
@@ -149,9 +149,9 @@
              follows="left|top|right"
              height="16"
              layout="topleft"
-             left_pad="8"
+             left_pad="5"
              name="maturity_value"
-             top_delta="0"
+             top_pad="-13"
              value="unknown"
              width="268" />
             <panel
@@ -284,7 +284,7 @@
                  width="290" />
                 <combo_box
                  follows="bottom|left|right"
-                 height="20"
+                 height="23"
                  layout="topleft"
                  left="0"
                  name="folder_combo"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index e7104fd34e..fdc26b5c46 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -17,7 +17,7 @@
      layout="topleft"
      left="0"
      name="landmarks_accordion"
-     top="2"
+     top="0"
      width="380">
         <accordion_tab
          layout="topleft"
@@ -107,7 +107,7 @@
          layout="topleft"
          left="10"
          name="options_gear_btn"
-         top="10"
+         top="14"
          width="18" />
         <button
          follows="bottom|left"
@@ -126,10 +126,10 @@
          image_selected="TrashItem_Press"
          image_unselected="TrashItem_Off"
          layout="topleft"
-         right="-10"
+         right="-8"
          name="trash_btn"
          tool_tip="Remove selected landmark"
-         top="10"
+         top="14"
          width="18" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index c6a4233c9c..e6f67078d1 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -2,7 +2,7 @@
 <panel
  background_visible="true"
  follows="all"
- height="400"
+ height="408"
  label="Things"
  layout="topleft"
  min_height="350"
@@ -13,102 +13,6 @@
      name="Title">
         Things
     </panel.string>
-    <filter_editor
-     text_pad_left="14"
-     follows="left|top|right"
-	height="23"
-     label="Filter Inventory"
-     layout="topleft"
-     left="15"
-max_length="300"
-     name="inventory search editor"
-     top="26"
-     width="303" />
-    <tab_container
-follows="all"
-halign="center"
-     height="300"
-     layout="topleft"
-     left_delta="-4"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
-     top_pad="4"
-     width="305">
-        <inventory_panel
-	       border="false"
-         follows="all"
-         height="295"
-         label="MY INVENTORY"
-         help_topic="my_inventory_tab"
-         layout="topleft"
-         left="0"
-         name="All Items"
-         top="16"
-         width="290" />
-        <inventory_panel
-	       border="false"
-         follows="all"
-         height="295"
-         label="RECENT"
-         help_topic="recent_inventory_tab"
-         layout="topleft"
-         left_delta="0"
-         name="Recent Items"
-         width="290" />
-    </tab_container>
-
-    <panel
-     background_visible="true"
-     bevel_style="none"
-     bottom="0"
-     follows="left|right|bottom"
-     height="30"
-     layout="bottomleft"
-     left="0"
-	   visible="true"
-     name="bottom_panel"
-     width="330">
-        <button
-         follows="bottom|left"
-         tool_tip="Show additional options"
-         height="18"
-         image_disabled="OptionsMenu_Disabled"
-         image_selected="OptionsMenu_Press"
-         image_unselected="OptionsMenu_Off"
-         layout="topleft"
-         left="10"
-         name="options_gear_btn"
-         picture_style="true"
-         top="6"
-         width="18" />
-        <button
-         follows="bottom|left"
-         height="18"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
-         image_disabled="AddItem_Disabled"
-         layout="topleft"
-         left_pad="5"
-         name="add_btn"
-         picture_style="true"
-         tool_tip="Add new item"
-         width="18" />
-        <dnd_button
-         follows="bottom|right"
-         height="18"
-         image_selected="TrashItem_Press"
-         image_unselected="TrashItem_Off"
-         layout="topleft"
-         right="-5"
-         name="trash_btn"
-         picture_style="true"
-         tool_tip="Remove selected item"
-         top="6"
-         width="18" />
-    </panel>
-
     <menu_bar
      bg_visible="false"
      follows="left|top|right"
@@ -470,4 +374,114 @@ halign="center"
             </menu_item_check>
         </menu>
     </menu_bar>
+    <filter_editor
+     text_pad_left="10"
+     follows="left|top|right"
+	height="23"
+     label="Filter Inventory"
+     layout="topleft"
+     left="10"
+max_length="300"
+     name="inventory search editor"
+     top="26"
+     width="303" />
+    <tab_container
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
+follows="all"
+halign="center"
+     height="305"
+     layout="topleft"
+     left="6"
+     name="inventory filter tabs"
+     tab_height="30"
+     tab_position="top"
+     tab_min_width="100"
+     top_pad="10"
+     width="315">
+        <inventory_panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
+	       border="false"
+	       bevel_style="none"
+         follows="all"
+         height="295"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         left="0"
+         name="All Items"
+         top="16"
+         width="290" />
+        <inventory_panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
+	       border="false"
+	       bevel_style="none"
+         follows="all"
+         height="295"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         width="290" />
+    </tab_container>
+
+    <panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
+     bevel_style="none"
+     follows="left|right|bottom"
+     height="38"
+     layout="topleft"
+     top_pad="-1"
+     left="9"
+     name="bottom_panel"
+     width="310">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="8"
+         name="options_gear_btn"
+         top="14"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="10"
+         name="add_btn"
+         tool_tip="Add new item"
+         width="18" />
+        <dnd_button
+         follows="bottom|right"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-7"
+         name="trash_btn"
+         tool_tip="Remove selected item"
+         top="14"
+         width="18" />
+    </panel>
+
+    
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 710ca733e0..86eaa79587 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -11,15 +11,15 @@
  border="false">
    <tab_container
      follows="all"
-     height="500"
+     height="490"
      layout="topleft"
-     left="10"
+     left="6"
      name="appearance_tabs"
      tab_min_width="140"
      tab_height="30"
      tab_position="top"
      halign="center"
-     width="313">
+     width="315">
          <inventory_panel
            background_visible="true"
            background_opaque="true"
@@ -49,39 +49,51 @@
            start_folder="Current Outfit"
            width="313" />
    </tab_container>
+	 <panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
+     follows="left|right|bottom"
+	  height="38"
+	  layout="topleft"
+	  left="9"
+	  visible="true"
+	  top_pad="-1"
+     width="310" />
 	<panel
-	  background_visible="true"
+	  background_visible="false"
 	  follows="bottom|left"
 	  height="50"
 	  layout="topleft"
-	  left="0"
+	  left="9"
 	  visible="true"
 	  name="bottom_panel"
-	  top_pad="10"
-	  width="313">
-		 <button
-		  follows="bottom|left"
-		  tool_tip="Show additional options"
-		  height="18"
-		  image_disabled="OptionsMenu_Disabled"
-		  image_selected="OptionsMenu_Press"
-		  image_unselected="OptionsMenu_Off"
-		  layout="topleft"
-		  left="10"
-		  name="options_gear_btn"
-		  top="6"
-		  width="18" />
-         <dnd_button
-		  follows="bottom|left"
-		  height="18"
-		  image_selected="TrashItem_Press"
-		  image_unselected="TrashItem_Off"
-		  layout="topleft"
-		  right="-5"
-		  name="trash_btn"
-		  tool_tip="Remove selected item"
-		  top="6"
-		  width="18" />
+	  top_pad="-38"
+	  width="310">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="8"
+         name="options_gear_btn"
+         top="14"
+         width="18" />
+        <dnd_button
+         follows="bottom|right"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-9"
+         name="trash_btn"
+         tool_tip="Remove selected item"
+         top="14"
+         width="18" />
 	 <button
 	  follows="bottom|left"
 		height="23" 
@@ -89,20 +101,19 @@
       layout="topleft"
       name="make_outfit_btn"
       tool_tip="Save appearance as an outfit"
-       top="26"
-       left='10'
-      width="120" />
+       top="43"
+       left="0"
+      width="153" />
      <button
       follows="bottom|right" 
       height="23" 
       label="Wear"
       layout="topleft"
       name="wear_btn"
-      right="-10"
-      left_pad="10"
-       top="26"
+      left_pad="3"
+       top="43"
       tool_tip="Wear selected outfit"
-      width="120" />
+      width="152" />
 	 <button
 	  follows="bottom|left"
 		height="23" 
@@ -114,4 +125,5 @@
         visible="false" 
 		width="20" />
 	 </panel>
+       
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 752bccc351..daab52f06a 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -29,6 +29,7 @@
      name="groups_filter_label"
      value="Filter Groups" />
     <filter_editor
+     text_pad_left="10"
      follows="left|top|right"
      height="23"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 54a5db9b16..0093a08e15 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -4,7 +4,7 @@ bg_opaque_color="DkGray2"
        background_visible="true"
        background_opaque="true"
  follows="all"
- height="547"
+ height="548"
  label="Picks"
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 94c9b2de01..b22dad5841 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -8,7 +8,7 @@
  min_height="350"
  name="place_profile"
  top="20"
- width="330">
+ width="333">
     <string
      name="on"
      value="On" />
@@ -143,11 +143,11 @@
      height="23"
      image_overlay="BackArrow_Off"
      layout="topleft"
-     left="10"
+     left="11"
      name="back_btn"
      tool_tip="Back"
      tab_stop="false"
-     top="0"
+     top="4"
      width="23" />
     <text
      follows="top|left|right"
@@ -157,36 +157,36 @@
      left_pad="10"
      name="title"
      text_color="LtGray"
-     top="0"
+     top="2"
      use_ellipses="true"
      value="Place Profile"
-     width="275" />
+     width="280" />
     <scroll_container
      color="DkGray2"
      follows="all"
-     height="533"
+     height="532"
      layout="topleft"
-     left="10"
+     left="9"
      name="place_scroll"
      opaque="true"
-     top_pad="5"
-     width="313">
+     top_pad="10"
+     width="310">
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="533"
+         height="700"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="313">
+         width="285">
             <texture_picker
              enabled="false"
-             follows="top|left"
-             height="190"
+         follows="left|top|right"
+             height="197"
              layout="topleft"
-             left="10"
+             left="11"
              name="logo"
              top="10"
              width="290" />
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index c4e4b9aa9b..57535649de 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -17,12 +17,12 @@ background_visible="true"
      name="teleport_history_tab_title"
      value="TELEPORT HISTORY" />
     <filter_editor
-     text_pad_left="14"
+     text_pad_left="10"
      follows="left|top|right"
      font="SansSerifSmall"
      height="23"
      layout="topleft"
-     left="15"
+     left="10"
      label="Filter My Places"
      max_length="300"
      name="Filter"
@@ -31,15 +31,15 @@ background_visible="true"
     <tab_container
      follows="all"
      halign="center"
-     height="500"
+     height="503"
      layout="topleft"
-     left="10"
+     left="6"
      name="Places Tabs"
      tab_min_width="80"
      tab_height="30"
      tab_position="top"
      top_pad="10"
-     width="313" />
+     width="315" />
     <panel
      class="panel_place_profile"
      filename="panel_place_profile.xml"
@@ -51,7 +51,7 @@ background_visible="true"
      name="panel_place_profile"
      top="5"
      visible="false"
-     width="313" />
+     width="315" />
     <panel
      class="panel_landmark_info"
      filename="panel_landmark_info.xml"
@@ -63,13 +63,13 @@ background_visible="true"
      name="panel_landmark_info"
      top="5"
      visible="false"
-     width="313" />
+     width="315" />
     <panel
      height="19"
      layout="topleft"
-     left="0"
+     left="4"
      name="button_panel"
-     width="313">
+     width="315">
         <button
          follows="bottom|left"
          height="23"
@@ -78,65 +78,58 @@ background_visible="true"
          left="5"
          name="teleport_btn"
          tool_tip="Teleport to the selected area"
-         top="0"
-         width="100" />
+         top="1"
+         width="108" />
         <button
          follows="bottom|left"
          height="23"
          label="Map"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="map_btn"
-         top="0"
-         width="70" />
+         width="85" />
         <button
          follows="bottom|left"
          height="23"
          label="Edit"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="edit_btn"
          tool_tip="Edit landmark information"
-         top="0"
-         width="70" />
+         width="83" />
         <button
          follows="bottom|right"
          height="23"
-         image_disabled="ForwardArrow_Off"
-         image_selected="ForwardArrow_Press"
-         image_unselected="ForwardArrow_Off"
+         label="▼"
          layout="topleft"
          name="overflow_btn"
          tool_tip="Show additional options"
-         right="-10"
-         top="0"
-         width="18" />
+         left_pad="3"
+         width="23" />
         <button
-         follows="bottom|right"
+         follows="bottom|left"
          height="23"
-         label="Close"
+         label="Save"
          layout="topleft"
-         name="close_btn"
-         right="-10"
-         top="0"
-         width="60" />
+         name="save_btn"
+         left="5"
+         top_pad="-23"
+         width="152" />
         <button
          follows="bottom|right"
          height="23"
          label="Cancel"
          layout="topleft"
          name="cancel_btn"
-         right="-10"
-         top="0"
-         width="60" />
+         left_pad="3"
+         width="153" />
         <button
          follows="bottom|right"
          height="23"
-         label="Save"
+         label="Close"
          layout="topleft"
-         name="save_btn"
-         right="-75"
-         top="0"
+         name="close_btn"
+         left_pad="3"
          width="60" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 06da64533b..ecf7252a11 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Teleport History" bottom="0" height="326" left="0" width="380"
+<panel name="Teleport History" bottom="0" height="400" left="0" width="380"
      help_topic="panel_teleport_history"
-     border="true" follows="left|top|right|bottom">     
+     border="false" follows="left|top|right|bottom">     
     <accordion
      follows="left|top|right|bottom"
-     height="300"
+     height="368"
      layout="topleft"
      left="0"
      top="0"
      name="history_accordion"
+   background_visible="true"
+   bg_alpha_color="DkGray2"
      width="380">
 	    <accordion_tab
          layout="topleft"
@@ -51,7 +53,7 @@
              top="0"
              width="380">
 	        </flat_list_view>
-	    </accordion_tab>
+	    </accordion_tab>5
         <accordion_tab
          layout="topleft"
          name="3_days_ago"
@@ -138,19 +140,20 @@
 	    </accordion_tab>
     </accordion>
     <panel
-     background_visible="true"
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
      bevel_style="none"
-     top_pad="0"
+     bottom="0"
      follows="left|right|bottom"
-     height="30"
-     label="bottom_panel"
-     layout="topleft"
+     height="38"
+     layout="bottomleft"
      left="0"
      name="bottom_panel"
      width="380">
         <button
          follows="bottom|left"
-         font="SansSerifBigBold"
          tool_tip="Show additional optioins"
          height="18"
          image_disabled="OptionsMenu_Disabled"
@@ -159,7 +162,7 @@
          layout="topleft"
          left="10"
          name="gear_btn"
-         top="5"
+         top="14"
          width="18" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index bde45a9487..b3d55fec65 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -37,20 +37,20 @@ width="333">
       name="openoutfit_btn" />
       <icon
       follows="top|left"
-      height="30"
+      height="24"
       image_name="TabIcon_Appearance_Off"
       name="outfit_icon"
       mouse_opaque="false"
       visible="true"
-      left="5"
+      left="9"
       top="0"
-      width="30" />
+      width="24" />
       <text
       font="SansSerifHugeBold"
       height="20"
       left_pad="5"
       text_color="LtGray"
-      top="3"
+      top="0"
       use_ellipses="true"
       width="305"
       follows="top|left"
@@ -76,7 +76,7 @@ width="333">
    height="23"
    follows="left|top|right"
    layout="topleft"
-   left="15"
+   left="10"
    label="Filter Outfits"
    max_length="300"
    name="Filter"
@@ -90,7 +90,7 @@ width="333">
    min_height="410"
    width="320"
    left="0"
-   top_pad="0"
+   top_pad="6"
    follows="all" />
   <!--   <button
 	  follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index fb5f9d2ec8..a233d42568 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -32,10 +32,10 @@
 			 width="330" />
 		<panel
 			 height="25"
-			 layout="bottomright"
+			 layout="topleft"
 			 name="button_panel"
-			 left="5"
-			 bottom="5"
+			 left="9"
+			 top_pad="-2"
 			 width="313">
 			<button
 				 enabled="true"
@@ -46,17 +46,17 @@
 				 left="0"
 				 name="info_btn"
 				 top="0"
-				 width="100" />
+				 width="153" />
 			<button
 				 enabled="false"
 				 follows="bottom|left"
 				 height="23"
 				 label="Wear"
 				 layout="topleft"
-				 left="130"
+				 left="156"
 				 name="wear_btn"
 				 top="0"
-				 width="100" />
+				 width="152" />
 			<button
 				 enabled="false"
 				 follows="bottom|left"
@@ -64,19 +64,19 @@
 				 label="Play"
 				 layout="topleft"
 				 name="play_btn"
-				 left="130"
+				 left="156"
 				 top="0"
-				 width="80" />
+				 width="152" />
 			<button
 				 enabled="false"
 				 follows="bottom|left"
 				 height="23"
 				 label="Teleport"
 				 layout="topleft"
-				 left="130"
+				 left="156"
 				 name="teleport_btn"
 				 top="0"
-				 width="100" />
+				 width="152" />
 		</panel>
 	</panel>
 
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 18b59741bf..12c06504ca 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -43,10 +43,10 @@
      height="23"
      image_overlay="BackArrow_Off"
      layout="topleft"
-     left="10"
+     left="14"
      name="back_btn"
      tab_stop="false"
-     top="0"
+     top="2"
      width="23" />
     <text
      follows="top|left|right"
@@ -71,10 +71,10 @@
      width="150" />
 	<panel
          follows="all"
-         height="490"
+         height="493"
          label=""
          layout="topleft"
-         left="10"
+         left="9"
          help_topic=""
          top="45"
          width="313"
@@ -161,13 +161,14 @@
 	     </text>
 	     <button
 			 follows="top|right"
-			 height="23"
-			 label="Profile"
+			 height="16"
+     image_selected="Inspector_I"
+     image_unselected="Inspector_I"
 			 layout="topleft"
-			 right="-1"
+			 right="-5"
 			 name="BtnCreator"
 			 top_delta="-6"
-			 width="78" />
+			 width="16" />
 	     <text
 			 type="string"
 			 length="1"
@@ -203,13 +204,14 @@
 	     </text>
 	     <button
 			 follows="top|right"
-			 height="23"
-			 label="Profile"
+			 height="16"
+     image_selected="Inspector_I"
+     image_unselected="Inspector_I"
 			 layout="topleft"
-			 right="-1"
+			 right="-5"
 			 name="BtnOwner"
 			 top_delta="-3"
-			 width="78" />
+			 width="16" />
 	     <text
 			 type="string"
 			 length="1"
@@ -239,8 +241,6 @@ top_pad="10"
          follows="left|top"
          layout="topleft"
          mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
          name="perms_inv"
          left="0"
          top_pad="25"
@@ -400,7 +400,7 @@ top_pad="10"
    </panel>
     <panel
 		 height="30"
-		 layout="bottomright"
+		 layout="topleft"
 		 name="button_panel"
 		 left="5"
 		 bottom="2"