EXT-923 Add new art to viewer. Create references to AddItem OptionsMenu and TrashItem Disabled states in xml. Link new art up in textures.xml.

20 files changed, 413 insertions, 390 deletions

diff --git a/indra/newview/skins/default/textures/icons/AddItem_Disabled.png b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png
new file mode 100644
index 0000000000..cf88c89ae5
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/DragHandle.png b/indra/newview/skins/default/textures/icons/DragHandle.png
new file mode 100644
index 0000000000..c3cbc07a33
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/DragHandle.png
diff --git a/indra/newview/skins/default/textures/icons/Lock.png b/indra/newview/skins/default/textures/icons/Lock.png
new file mode 100644
index 0000000000..eb5b5ae7a9
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Lock.png
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png
new file mode 100644
index 0000000000..fb341e9c83
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/Refresh_Off.png b/indra/newview/skins/default/textures/icons/Refresh_Off.png
new file mode 100644
index 0000000000..a8acfda741
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Refresh_Off.png
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png
new file mode 100644
index 0000000000..caaf45a99f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e32ea0944e..0ae65fb788 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -7,17 +7,19 @@
   <texture name="Accordion_Off" file_name="containers/Accordion_Off.png" preload="false" />
   <texture name="Accordion_Press" file_name="containers/Accordion_Press.png" preload="false" />
 
+  <texture name="AddItem_Disabled" file_name="icons/AddItem_Disabled.png" preload="false" />
   <texture name="AddItem_Off" file_name="icons/AddItem_Off.png" preload="false" />
   <texture name="AddItem_Press" file_name="icons/AddItem_Press.png" preload="false" />
 
-  <texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true"/>
-  <texture name="Arrow_Left_Press" file_name="navbar/Arrow_Left_Press.png" preload="true"/>
-  <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true"/>
-  <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true"/>
+  <texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true" />
+  <texture name="Arrow_Left_Press" file_name="navbar/Arrow_Left_Press.png" preload="true" />
+  <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true" />
+  <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true" />
 
   <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
   <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
 
+  <texture name="BackArrow_Disabled" file_name="icons/BackArrow_Disabled.png" preload="false" />
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
   <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
 
@@ -54,7 +56,7 @@
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
   <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
-  <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="false"/>
+  <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="false" />
 
   <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" />
   <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" />
@@ -62,13 +64,13 @@
   <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
   <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
 
-  <texture name="Help_Off" file_name="navbar/Help_Off.png" preload="false"/>
-  <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false"/>
+  <texture name="Help_Off" file_name="navbar/Help_Off.png" preload="false" />
+  <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false" />
 
-  <texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true"/>
+  <texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true" />
 
-  <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false"/>
-  <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="false"/>
+  <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false" />
+  <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="false" />
 
   <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" />
   <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
@@ -79,22 +81,35 @@
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
-  <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false"/>
-  <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false"/>
-  <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false"/>
+  <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
+  <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
+  <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" />
 
-  <texture name="Icon_Undock_Background" file_name="windows/Icon_Undock_Background.png" preload="true" />
-  <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="true" />
-  <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="true" />
+  <texture name="Icon_Help_Background" file_name="windows/Icon_Help_Background.png" preload="false" />
+  <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="false" />
+  <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="false" />
+  <texture name="Icon_Info" file_name="windows/Icon_Info.png" preload="false" />
+
+  <texture name="Icon_Minimize_Background" file_name="windows/Icon_Minimize_Background.png" preload="true" />
+  <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
+  <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
+
+  <texture name="Icon_Undock_Background" file_name="windows/Icon_Undock_Background.png" preload="false" />
+  <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="false" />
+  <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" />
 
   <texture name="Info" file_name="icons/Info.png" preload="false" />
+  <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
+  <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false" />
 
-  <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false"/>
-  <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false"/>
+  <texture name="Inspector_Background" file_name="windows/Inspector_Background.png" preload="false" />
+   <texture name="Inspector_Hover" file_name="windows/Inspector_Hover.png" preload="false" />
 
   <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" />
   <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" />
 
+  <texture name="Lock" file_name="icons/Lock.png" preload="false" />
+
   <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
   <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="false" />
@@ -105,6 +120,7 @@
   <texture name="NearbyVoice_Lvl3" file_name="bottomtray/NearbyVoice_Lvl3.png" preload="false" />
   <texture name="NearbyVoice_On" file_name="bottomtray/NearbyVoice_On.png" preload="false" />
 
+  <texture name="OptionsMenu_Disabled" file_name="icons/OptionsMenu_Diabled.png" preload="false" />
   <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
   <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
 
@@ -117,7 +133,7 @@
   <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  
+
   <texture name="RadioButton_Press" file_name="widgets/RadioButton_Press.png" preload="true" />
   <texture name="RadioButton_On_Press" file_name="widgets/RadioButton_On_Press.png" preload="true" />
   <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" />
@@ -125,7 +141,7 @@
   <texture name="RadioButton_Disabled" file_name="widgets/RadioButton_Disabled.png" preload="true" />
   <texture name="RadioButton_On_Disabled" file_name="widgets/RadioButton_On_Disabled.png"	preload="true" />
 
-  <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true"/>
+  <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true" />
 
   <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="false" />
 
@@ -139,7 +155,7 @@
   <texture name="ScrollTrack_Vert" file_name="widgets/ScrollTrack_Vert.png" preload="true" scale.left="2" scale.top="40" scale.bottom="13" scale.right="0" />
   <texture name="ScrollTrack_Horiz" file_name="widgets/ScrollTrack_Horiz.png" preload="true" scale.left="4" scale.top="0" scale.bottom="0" scale.right="2" />
 
-  <texture name="Search" file_name="navbar/Search.png" preload="false"/>
+  <texture name="Search" file_name="navbar/Search.png" preload="false" />
 
   <texture name="SegmentedBtn_Left_Off" file_name="widgets/SegmentedBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="SegmentedBtn_Left_Press" file_name="widgets/SegmentedBtn_Left_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
@@ -168,35 +184,35 @@
   <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" />
   <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" />
 
-  <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true"/>
-  <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true"/>
-  <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true"/>
-  <texture name="Stepper_Up_Disabled" file_name="widgets/Stepper_Up_Disabled.png" preload="true"/>
-  <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true"/>
-  <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true"/>
+  <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true" />
+  <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true" />
+  <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true" />
+  <texture name="Stepper_Up_Disabled" file_name="widgets/Stepper_Up_Disabled.png" preload="true" />
+  <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true" />
+  <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true" />
 
   <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
-  <texture name="TabIcon_Appearance_Over" file_name="taskpanel/TabIcon_Appearance_Over.png" preload="false"/>
+  <texture name="TabIcon_Appearance_Over" file_name="taskpanel/TabIcon_Appearance_Over.png" preload="false" />
   <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
-  <texture name="TabIcon_Close_Over" file_name="taskpanel/TabIcon_Close_Over.png" preload="false"/>
+  <texture name="TabIcon_Close_Over" file_name="taskpanel/TabIcon_Close_Over.png" preload="false" />
   <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
-  <texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false"/>
+  <texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false" />
   <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
   <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" />
-  <texture name="TabIcon_Me_Over" file_name="taskpanel/TabIcon_Me_Over.png" preload="false"/>
+  <texture name="TabIcon_Me_Over" file_name="taskpanel/TabIcon_Me_Over.png" preload="false" />
   <texture name="TabIcon_Me_Selected" file_name="taskpanel/TabIcon_Me_Selected.png" preload="false" />
   <texture name="TabIcon_Open_Off" file_name="taskpanel/TabIcon_Open_Off.png" preload="false" />
-  <texture name="TabIcon_Open_Over" file_name="taskpanel/TabIcon_Open_Over.png" preload="false"/>
+  <texture name="TabIcon_Open_Over" file_name="taskpanel/TabIcon_Open_Over.png" preload="false" />
   <texture name="TabIcon_People_Off" file_name="taskpanel/TabIcon_People_Off.png" preload="false" />
-  <texture name="TabIcon_People_Over" file_name="taskpanel/TabIcon_People_Over.png" preload="false"/>
+  <texture name="TabIcon_People_Over" file_name="taskpanel/TabIcon_People_Over.png" preload="false" />
   <texture name="TabIcon_People_Selected" file_name="taskpanel/TabIcon_People_Selected.png" preload="false" />
-  <texture name="TabIcon_Places_Over" file_name="taskpanel/TabIcon_Places_Over.png" preload="false"/>
+  <texture name="TabIcon_Places_Over" file_name="taskpanel/TabIcon_Places_Over.png" preload="false" />
   <texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="false" />
   <texture name="TabIcon_Places_Selected" file_name="taskpanel/TabIcon_Places_Selected.png" preload="false" />
   <texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="false" />
   <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="false" />
-  <texture name="TabIcon_Things_Over" file_name="taskpanel/TabIcon_Things_Over.png" preload="false"/>
+  <texture name="TabIcon_Things_Over" file_name="taskpanel/TabIcon_Things_Over.png" preload="false" />
 
   <texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="false" />
   <texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="false" />
@@ -206,8 +222,8 @@
   <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" />
   <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
   <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
-  <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
-  <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png"	preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
+  <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
+  <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png"	preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
 
   <texture name="TaskPanel_Tab_Off" file_name="taskpanel/TaskPanel_Tab_Off.png" preload="false" scale.left="4" scale.top="29" scale.right="36" scale.bottom="4" />
   <texture name="TaskPanel_Tab_Selected" file_name="taskpanel/TaskPanel_Tab_Selected.png" preload="false" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
@@ -235,6 +251,7 @@
   <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" />
   <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" />
 
+  <texture name="TrashItem_Disabled" file_name="icons/TrashItem_Disabled.png" preload="false" />
   <texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="false" />
   <texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="false" />
 
@@ -256,297 +273,297 @@
 
 
 
-  <!--There are still references to this old textfield art in the code somewhere -erica-->
+  <!--WARNING OLD ART *do not use*-->
 
-  <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
-  <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
+  <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
+  <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
 
-  <texture name="cam_rotate_out.tga" preload="false"/>
-  <texture name="cam_rotate_in.tga" preload="false"/>
-  <texture name="cam_zoom_out.tga" preload="false"/>
-  <texture name="cam_zoom_plus_in.tga" preload="false"/>
-  <texture name="cam_zoom_minus_in.tga" preload="false"/>
+  <texture name="cam_rotate_out.tga" preload="false" />
+  <texture name="cam_rotate_in.tga" preload="false" />
+  <texture name="cam_zoom_out.tga" preload="false" />
+  <texture name="cam_zoom_plus_in.tga" preload="false" />
+  <texture name="cam_zoom_minus_in.tga" preload="false" />
 
-  <texture name="close_inactive_blue.tga"/>
-  <texture name="closebox.tga"/>
+  <texture name="close_inactive_blue.tga" />
+  <texture name="closebox.tga" />
   <texture name="icn_clear_lineeditor.tga" />
 
-  <texture name="icn_chatbar.tga"/>
-  <texture name="icn_media-pause.tga"/>
-  <texture name="icn_media-play.tga"/>
-  <texture name="icn_music-play.tga"/>
-  <texture name="icn_music-pause.tga"/>
-  <texture name="icn_media_web.tga" preload="true"/>
-  <texture name="icn_media_movie.tga" preload="true"/>
-
-  <texture name="icn_speaker-muted_dark.tga"/>
-  <texture name="icn_speaker_dark.tga"/>
-
-  <texture name="icn_voice-localchat.tga"/>
-  <texture name="icn_voice-groupfocus.tga"/>
-  <texture name="icn_voice-pvtfocus.tga"/>
-
-  <texture name="jump_left_out.tga"/>
-  <texture name="jump_left_in.tga"/>
-  <texture name="jump_right_out.tga"/>
-  <texture name="jump_right_in.tga"/>
-
-  <texture name="move_forward_out.tga" preload="false"/>
-  <texture name="move_forward_in.tga" preload="false"/>
-  <texture name="move_left_out.tga" preload="false"/>
-  <texture name="move_left_in.tga" preload="false"/>
-  <texture name="move_turn_left_out.tga" preload="false"/>
-  <texture name="move_turn_left_in.tga" preload="false"/>
-  <texture name="move_turn_right_out.tga" preload="false"/>
-  <texture name="move_turn_right_in.tga" preload="false"/>
-  <texture name="move_right_out.tga" preload="false"/>
-  <texture name="move_right_in.tga" preload="false"/>
-  <texture name="move_up_in.tga" preload="false"/>
-  <texture name="move_up_out.tga" preload="false"/>
-  <texture name="move_down_in.tga" preload="false"/>
-  <texture name="move_down_out.tga" preload="false"/>
-
-  <texture name="tool_grab.tga"/>
-  <texture name="tool_grab_active.tga"/>
-
-  <texture name="tool_face.tga"/>
-  <texture name="tool_face_active.tga"/>
-
-  <texture name="tool_create.tga"/>
-  <texture name="tool_create_active.tga"/>
-
-  <texture name="up_arrow.tga" file_name="up_arrow.png"/>
-  <texture name="down_arrow.tga" file_name="down_arrow.png"/>
-
-  <texture name="restore_inactive.tga"/>
-  <texture name="restore.tga"/>
-  <texture name="restore_pressed.tga"/>
-
-  <texture name="tearoffbox.tga"/>
-  <texture name="tearoff_pressed.tga"/>
-
-  <texture name="icn_label_music.tga"/>
-  <texture name="icn_label_media.tga"/>
-  <texture name="arrow_down.tga"/>
-  <texture name="cloud-particle.j2c" use_mips="true"/>
+  <texture name="icn_chatbar.tga" />
+  <texture name="icn_media-pause.tga" />
+  <texture name="icn_media-play.tga" />
+  <texture name="icn_music-play.tga" />
+  <texture name="icn_music-pause.tga" />
+  <texture name="icn_media_web.tga" preload="true" />
+  <texture name="icn_media_movie.tga" preload="true" />
+
+  <texture name="icn_speaker-muted_dark.tga" />
+  <texture name="icn_speaker_dark.tga" />
+
+  <texture name="icn_voice-localchat.tga" />
+  <texture name="icn_voice-groupfocus.tga" />
+  <texture name="icn_voice-pvtfocus.tga" />
+
+  <texture name="jump_left_out.tga" />
+  <texture name="jump_left_in.tga" />
+  <texture name="jump_right_out.tga" />
+  <texture name="jump_right_in.tga" />
+
+  <texture name="move_forward_out.tga" preload="false" />
+  <texture name="move_forward_in.tga" preload="false" />
+  <texture name="move_left_out.tga" preload="false" />
+  <texture name="move_left_in.tga" preload="false" />
+  <texture name="move_turn_left_out.tga" preload="false" />
+  <texture name="move_turn_left_in.tga" preload="false" />
+  <texture name="move_turn_right_out.tga" preload="false" />
+  <texture name="move_turn_right_in.tga" preload="false" />
+  <texture name="move_right_out.tga" preload="false" />
+  <texture name="move_right_in.tga" preload="false" />
+  <texture name="move_up_in.tga" preload="false" />
+  <texture name="move_up_out.tga" preload="false" />
+  <texture name="move_down_in.tga" preload="false" />
+  <texture name="move_down_out.tga" preload="false" />
+
+  <texture name="tool_grab.tga" />
+  <texture name="tool_grab_active.tga" />
+
+  <texture name="tool_face.tga" />
+  <texture name="tool_face_active.tga" />
+
+  <texture name="tool_create.tga" />
+  <texture name="tool_create_active.tga" />
+
+  <texture name="up_arrow.tga" file_name="up_arrow.png" />
+  <texture name="down_arrow.tga" file_name="down_arrow.png" />
+
+  <texture name="restore_inactive.tga" />
+  <texture name="restore.tga" />
+  <texture name="restore_pressed.tga" />
+
+  <texture name="tearoffbox.tga" />
+  <texture name="tearoff_pressed.tga" />
+
+  <texture name="icn_label_music.tga" />
+  <texture name="icn_label_media.tga" />
+  <texture name="arrow_down.tga" />
+  <texture name="cloud-particle.j2c" use_mips="true" />
 
   <texture name="skin_thumbnail_default.png" preload="false" />
 
-  <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5"/>
-  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/>
+  <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5" />
+  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114" />
 
   <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
   <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
   <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
 
-  <texture name="minimize_inactive.tga" preload="true"/>
+<!--TODO: REPLACE CODE REFERENCE TO THIS ART WITH Icon_Minimize_Background above -->
+  <texture name="minimize_inactive.tga" preload="true" />
   <texture name="minimize.tga" preload="true" />
-  <texture name="minimize_pressed.tga"	preload="true"/>
+  <texture name="minimize_pressed.tga"	preload="true" />
 
-  <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
+  <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
 
   <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
 
-  <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
-
-  <texture name="toolbar_tab.tga"	preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8"/>
-  <texture name="toolbar_bg.tga"	preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16"/>
-
-  <texture name="tab_top_blue.tga"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
-  <texture name="tab_top_selected_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
-
-  <texture name="startup_logo.j2c" preload="true"/>
-  <texture name="color_swatch_alpha.tga" preload="true"/>
-
-  <texture name="active_voice_tab.tga"/>
-  <texture name="button_anim_pause.tga"/>
-  <texture name="button_anim_pause_selected.tga"/>
-  <texture name="button_anim_play.tga"/>
-  <texture name="button_anim_play_selected.tga"/>
-  <texture name="button_anim_stop.tga"/>
-  <texture name="button_anim_stop_selected.tga"/>
-  <texture name="crosshairs.tga"/>
-  <texture name="direction_arrow.tga"/>
-  <texture name="foot_shadow.j2c" use_mips="true"/>
-
-  <texture name="icon_auction.tga"/>
-  <texture name="icon_avatar_offline.tga"/>
-  <texture name="icon_avatar_online.tga"/>
-  <texture name="icon_day_cycle.tga"/>
-  <texture name="icon_diurnal.tga"/>
-  <texture name="icon_event.tga"/>
-  <texture name="icon_event_mature.tga"/>
-  <texture name="icon_for_sale.tga"/>
-  <texture name="icon_group.tga"/>
-  <texture name="icon_groupnotice.tga"/>
-  <texture name="icon_groupnoticeinventory.tga"/>
-  <texture name="icon_lock.tga"/>
-  <texture name="icon_place.tga"/>
-  <texture name="icon_place_for_sale.tga"/>
-  <texture name="icon_popular.tga"/>
-  <texture name="icon_top_pick.tga"/>
-
-  <texture name="inv_folder_animation.tga"/>
-  <texture name="inv_folder_bodypart.tga"/>
-  <texture name="inv_folder_callingcard.tga"/>
-  <texture name="inv_folder_clothing.tga"/>
-  <texture name="inv_folder_current_outfit.tga"/>
-  <texture name="inv_folder_gesture.tga"/>
-  <texture name="inv_folder_landmark.tga"/>
-  <texture name="inv_folder_lostandfound.tga"/>
-  <texture name="inv_folder_my_outfits.tga"/>
-  <texture name="inv_folder_notecard.tga"/>
-  <texture name="inv_folder_object.tga"/>
-  <texture name="inv_folder_outfit.tga"/>
-  <texture name="inv_folder_plain_closed.tga"/>
-  <texture name="inv_folder_script.tga"/>
-  <texture name="inv_folder_snapshot.tga"/>
-  <texture name="inv_folder_sound.tga"/>
-  <texture name="inv_folder_texture.tga"/>
-  <texture name="inv_folder_trash.tga"/>
-
-  <texture name="inv_item_animation.tga"/>
-  <texture name="inv_item_skin.tga"/>
-  <texture name="inv_item_callingcard_offline.tga"/>
-  <texture name="inv_item_callingcard_online.tga"/>
-  <texture name="inv_item_eyes.tga"/>
-  <texture name="inv_item_gesture.tga"/>
-  <texture name="inv_item_gloves.tga"/>
-  <texture name="inv_item_hair.tga"/>
-  <texture name="inv_item_jacket.tga"/>
-  <texture name="inv_item_landmark.tga"/>
-  <texture name="inv_item_landmark_visited.tga"/>
-  <texture name="inv_item_linkitem.tga"/>
-  <texture name="inv_item_linkfolder.tga"/>
-  <texture name="inv_item_notecard.tga"/>
-  <texture name="inv_item_object.tga"/>
-  <texture name="inv_item_object_multi.tga"/>
-  <texture name="inv_item_pants.tga"/>
-  <texture name="inv_item_script.tga"/>
-  <texture name="inv_item_shape.tga"/>
-  <texture name="inv_item_shirt.tga"/>
-  <texture name="inv_item_shoes.tga"/>
-  <texture name="inv_item_skirt.tga"/>
-  <texture name="inv_item_snapshot.tga"/>
-  <texture name="inv_item_socks.tga"/>
-  <texture name="inv_item_sound.tga"/>
-  <texture name="inv_item_texture.tga"/>
-  <texture name="inv_item_underpants.tga"/>
-  <texture name="inv_item_undershirt.tga"/>
-
-  <texture name="lag_status_critical.tga"/>
-  <texture name="lag_status_good.tga"/>
-  <texture name="lag_status_warning.tga"/>
-
-  <texture name="legend.tga"/>
-
-  <texture name="map_avatar_16.tga"/>
-  <texture name="map_avatar_8.tga"/>
-  <texture name="map_avatar_you_8.tga"/>
-  <texture name="map_event.tga"/>
-  <texture name="map_event_mature.tga"/>
-  <texture name="map_home.tga"/>
-  <texture name="map_infohub.tga"/>
-  <texture name="map_telehub.tga"/>
-  <texture name="map_track_16.tga"/>
+  <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
+
+  <texture name="toolbar_tab.tga"	preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8" />
+  <texture name="toolbar_bg.tga"	preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16" />
+
+  <texture name="tab_top_blue.tga"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
+  <texture name="tab_top_selected_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
+
+  <texture name="startup_logo.j2c" preload="true" />
+  <texture name="color_swatch_alpha.tga" preload="true" />
+
+  <texture name="active_voice_tab.tga" />
+  <texture name="button_anim_pause.tga" />
+  <texture name="button_anim_pause_selected.tga" />
+  <texture name="button_anim_play.tga" />
+  <texture name="button_anim_play_selected.tga" />
+  <texture name="button_anim_stop.tga" />
+  <texture name="button_anim_stop_selected.tga" />
+  <texture name="crosshairs.tga" />
+  <texture name="direction_arrow.tga" />
+  <texture name="foot_shadow.j2c" use_mips="true" />
+
+  <texture name="icon_auction.tga" />
+  <texture name="icon_avatar_offline.tga" />
+  <texture name="icon_avatar_online.tga" />
+  <texture name="icon_day_cycle.tga" />
+  <texture name="icon_diurnal.tga" />
+  <texture name="icon_event.tga" />
+  <texture name="icon_event_mature.tga" />
+  <texture name="icon_for_sale.tga" />
+  <texture name="icon_group.tga" />
+  <texture name="icon_groupnotice.tga" />
+  <texture name="icon_groupnoticeinventory.tga" />
+  <texture name="icon_place.tga" />
+  <texture name="icon_place_for_sale.tga" />
+  <texture name="icon_popular.tga" />
+  <texture name="icon_top_pick.tga" />
+
+  <texture name="inv_folder_animation.tga" />
+  <texture name="inv_folder_bodypart.tga" />
+  <texture name="inv_folder_callingcard.tga" />
+  <texture name="inv_folder_clothing.tga" />
+  <texture name="inv_folder_current_outfit.tga" />
+  <texture name="inv_folder_gesture.tga" />
+  <texture name="inv_folder_landmark.tga" />
+  <texture name="inv_folder_lostandfound.tga" />
+  <texture name="inv_folder_my_outfits.tga" />
+  <texture name="inv_folder_notecard.tga" />
+  <texture name="inv_folder_object.tga" />
+  <texture name="inv_folder_outfit.tga" />
+  <texture name="inv_folder_plain_closed.tga" />
+  <texture name="inv_folder_script.tga" />
+  <texture name="inv_folder_snapshot.tga" />
+  <texture name="inv_folder_sound.tga" />
+  <texture name="inv_folder_texture.tga" />
+  <texture name="inv_folder_trash.tga" />
+
+  <texture name="inv_item_animation.tga" />
+  <texture name="inv_item_skin.tga" />
+  <texture name="inv_item_callingcard_offline.tga" />
+  <texture name="inv_item_callingcard_online.tga" />
+  <texture name="inv_item_eyes.tga" />
+  <texture name="inv_item_gesture.tga" />
+  <texture name="inv_item_gloves.tga" />
+  <texture name="inv_item_hair.tga" />
+  <texture name="inv_item_jacket.tga" />
+  <texture name="inv_item_landmark.tga" />
+  <texture name="inv_item_landmark_visited.tga" />
+  <texture name="inv_item_linkitem.tga" />
+  <texture name="inv_item_linkfolder.tga" />
+  <texture name="inv_item_notecard.tga" />
+  <texture name="inv_item_object.tga" />
+  <texture name="inv_item_object_multi.tga" />
+  <texture name="inv_item_pants.tga" />
+  <texture name="inv_item_script.tga" />
+  <texture name="inv_item_shape.tga" />
+  <texture name="inv_item_shirt.tga" />
+  <texture name="inv_item_shoes.tga" />
+  <texture name="inv_item_skirt.tga" />
+  <texture name="inv_item_snapshot.tga" />
+  <texture name="inv_item_socks.tga" />
+  <texture name="inv_item_sound.tga" />
+  <texture name="inv_item_texture.tga" />
+  <texture name="inv_item_underpants.tga" />
+  <texture name="inv_item_undershirt.tga" />
+
+  <texture name="lag_status_critical.tga" />
+  <texture name="lag_status_good.tga" />
+  <texture name="lag_status_warning.tga" />
+
+  <texture name="legend.tga" />
+
+  <texture name="map_avatar_16.tga" />
+  <texture name="map_avatar_8.tga" />
+  <texture name="map_avatar_you_8.tga" />
+  <texture name="map_event.tga" />
+  <texture name="map_event_mature.tga" />
+  <texture name="map_home.tga" />
+  <texture name="map_infohub.tga" />
+  <texture name="map_telehub.tga" />
+  <texture name="map_track_16.tga" />
 
   <texture name="media_icon.tga" file_name="icn_label_media.tga" />
   <texture name="music_icon.tga" file_name="icn_label_music.tga" />
   <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
   <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
 
-  <texture name="notify_tip_icon.tga"/>
-  <texture name="notify_caution_icon.tga"/>
-  <texture name="notify_next.png" preload="true"/>
-  <texture name="notify_box_icon.tga"/>
-
-  <texture name="object_cone.tga"/>
-  <texture name="object_cone_active.tga"/>
-  <texture name="object_cube.tga"/>
-  <texture name="object_cube_active.tga"/>
-  <texture name="object_cylinder.tga"/>
-  <texture name="object_cylinder_active.tga"/>
-  <texture name="object_grass.tga"/>
-  <texture name="object_grass_active.tga"/>
-  <texture name="object_hemi_cone.tga"/>
-  <texture name="object_hemi_cone_active.tga"/>
-  <texture name="object_hemi_cylinder.tga"/>
-  <texture name="object_hemi_cylinder_active.tga"/>
-  <texture name="object_hemi_sphere.tga"/>
-  <texture name="object_hemi_sphere_active.tga"/>
-  <texture name="object_prism.tga"/>
-  <texture name="object_prism_active.tga"/>
-  <texture name="object_pyramid.tga"/>
-  <texture name="object_pyramid_active.tga"/>
-  <texture name="object_ring.tga"/>
-  <texture name="object_ring_active.tga"/>
-  <texture name="object_sphere.tga"/>
-  <texture name="object_sphere_active.tga"/>
-  <texture name="object_tetrahedron.tga"/>
-  <texture name="object_tetrahedron_active.tga"/>
-  <texture name="object_torus.tga"/>
-  <texture name="object_torus_active.tga"/>
-  <texture name="object_tree.tga"/>
-  <texture name="object_tree_active.tga"/>
-  <texture name="object_tube.tga"/>
-  <texture name="object_tube_active.tga"/>
-
-  <texture name="pixiesmall.j2c" use_mips="true"/>
-  <texture name="script_error.j2c" use_mips="true"/>
-  <texture name="silhouette.j2c" use_mips="true"/>
-
-  <texture name="status_no_build.tga"/>
-  <texture name="status_voice.tga"/>
-  <texture name="status_buy_currency.tga"/>
-  <texture name="status_buy_currency_pressed.tga"/>
-  <texture name="status_buy_land.tga"/>
-  <texture name="status_buy_land_pressed.tga"/>
-  <texture name="status_no_fly.tga"/>
-  <texture name="status_health.tga"/>
-  <texture name="status_no_push.tga"/>
-  <texture name="status_no_scripts.tga"/>
-
-  <texture name="tool_dozer.tga"/>
-  <texture name="tool_dozer_active.tga"/>
-  <texture name="tool_zoom.tga"/>
-  <texture name="tool_zoom_active.tga"/>
-
-  <texture name="icn_active-speakers-dot-lvl0.tga"/>
-  <texture name="icn_active-speakers-dot-lvl1.tga"/>
-  <texture name="icn_active-speakers-dot-lvl2.tga"/>
-  <texture name="icn_active-speakers-typing1.tga"/>
-  <texture name="icn_active-speakers-typing2.tga"/>
-  <texture name="icn_active-speakers-typing3.tga"/>
-
-  <texture name="icn_voice_ptt-off.tga"/>
-  <texture name="icn_voice_ptt-on.tga"/>
-  <texture name="icn_voice_ptt-on-lvl1.tga"/>
-  <texture name="icn_voice_ptt-on-lvl2.tga"/>
-  <texture name="icn_voice_ptt-on-lvl3.tga"/>
-  <texture name="icn_voice-call-end.tga"/>
-  <texture name="icn_voice-call-start.tga"/>
-
-  <texture name="mute_icon.tga"/>
-
-  <texture name="default_land_picture.j2c"/>
-  <texture name="default_profile_picture.j2c"/>
-  <texture name="locked_image.j2c"/>
-  
-  <texture name="media_btn_back.png"/>
-  <texture name="media_btn_done.png"/>
-  <texture name="media_btn_forward.png"/>
-  <texture name="media_btn_home.png"/>
-  <texture name="media_btn_newwindow.png"/>
-  <texture name="media_btn_optimalzoom.png"/>
-  <texture name="media_btn_reload.png"/>
-  <texture name="media_btn_scrolldown.png"/>
-  <texture name="media_btn_scrollleft.png"/>
-  <texture name="media_btn_scrollright.png"/>
-  <texture name="media_btn_scrollup.png"/>
-  <texture name="media_btn_stoploading.png"/>
-  <texture name="media_panel_divider.png"/>
-
-  <texture name="media_floater_border_16.png" scale_top="12" scale_left="4" scale_bottom="4" scale_right="12"/>
+  <texture name="notify_tip_icon.tga" />
+  <texture name="notify_caution_icon.tga" />
+  <texture name="notify_next.png" preload="true" />
+  <texture name="notify_box_icon.tga" />
+
+  <texture name="object_cone.tga" />
+  <texture name="object_cone_active.tga" />
+  <texture name="object_cube.tga" />
+  <texture name="object_cube_active.tga" />
+  <texture name="object_cylinder.tga" />
+  <texture name="object_cylinder_active.tga" />
+  <texture name="object_grass.tga" />
+  <texture name="object_grass_active.tga" />
+  <texture name="object_hemi_cone.tga" />
+  <texture name="object_hemi_cone_active.tga" />
+  <texture name="object_hemi_cylinder.tga" />
+  <texture name="object_hemi_cylinder_active.tga" />
+  <texture name="object_hemi_sphere.tga" />
+  <texture name="object_hemi_sphere_active.tga" />
+  <texture name="object_prism.tga" />
+  <texture name="object_prism_active.tga" />
+  <texture name="object_pyramid.tga" />
+  <texture name="object_pyramid_active.tga" />
+  <texture name="object_ring.tga" />
+  <texture name="object_ring_active.tga" />
+  <texture name="object_sphere.tga" />
+  <texture name="object_sphere_active.tga" />
+  <texture name="object_tetrahedron.tga" />
+  <texture name="object_tetrahedron_active.tga" />
+  <texture name="object_torus.tga" />
+  <texture name="object_torus_active.tga" />
+  <texture name="object_tree.tga" />
+  <texture name="object_tree_active.tga" />
+  <texture name="object_tube.tga" />
+  <texture name="object_tube_active.tga" />
+
+  <texture name="pixiesmall.j2c" use_mips="true" />
+  <texture name="script_error.j2c" use_mips="true" />
+  <texture name="silhouette.j2c" use_mips="true" />
+
+  <texture name="status_no_build.tga" />
+  <texture name="status_voice.tga" />
+  <texture name="status_buy_currency.tga" />
+  <texture name="status_buy_currency_pressed.tga" />
+  <texture name="status_buy_land.tga" />
+  <texture name="status_buy_land_pressed.tga" />
+  <texture name="status_no_fly.tga" />
+  <texture name="status_health.tga" />
+  <texture name="status_no_push.tga" />
+  <texture name="status_no_scripts.tga" />
+
+  <texture name="tool_dozer.tga" />
+  <texture name="tool_dozer_active.tga" />
+  <texture name="tool_zoom.tga" />
+  <texture name="tool_zoom_active.tga" />
+
+  <texture name="icn_active-speakers-dot-lvl0.tga" />
+  <texture name="icn_active-speakers-dot-lvl1.tga" />
+  <texture name="icn_active-speakers-dot-lvl2.tga" />
+  <texture name="icn_active-speakers-typing1.tga" />
+  <texture name="icn_active-speakers-typing2.tga" />
+  <texture name="icn_active-speakers-typing3.tga" />
+
+  <texture name="icn_voice_ptt-off.tga" />
+  <texture name="icn_voice_ptt-on.tga" />
+  <texture name="icn_voice_ptt-on-lvl1.tga" />
+  <texture name="icn_voice_ptt-on-lvl2.tga" />
+  <texture name="icn_voice_ptt-on-lvl3.tga" />
+  <texture name="icn_voice-call-end.tga" />
+  <texture name="icn_voice-call-start.tga" />
+
+  <texture name="mute_icon.tga" />
+
+  <texture name="default_land_picture.j2c" />
+  <texture name="default_profile_picture.j2c" />
+  <texture name="locked_image.j2c" />
+
+  <texture name="media_btn_back.png" />
+  <texture name="media_btn_done.png" />
+  <texture name="media_btn_forward.png" />
+  <texture name="media_btn_home.png" />
+  <texture name="media_btn_newwindow.png" />
+  <texture name="media_btn_optimalzoom.png" />
+  <texture name="media_btn_reload.png" />
+  <texture name="media_btn_scrolldown.png" />
+  <texture name="media_btn_scrollleft.png" />
+  <texture name="media_btn_scrollright.png" />
+  <texture name="media_btn_scrollup.png" />
+  <texture name="media_btn_stoploading.png" />
+  <texture name="media_panel_divider.png" />
+
+  <texture name="media_floater_border_16.png" scale_top="12" scale_left="4" scale_bottom="4" scale_right="12" />
 
   <texture name="media_panel_bg.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
   <texture name="media_panel_hoverrectangle.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
new file mode 100644
index 0000000000..350a62c0ae
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
new file mode 100644
index 0000000000..c2d401b131
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
new file mode 100644
index 0000000000..a164edb62d
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
new file mode 100644
index 0000000000..990e03e2b2
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_Background.png b/indra/newview/skins/default/textures/windows/Inspector_Background.png
new file mode 100644
index 0000000000..807e8e553c
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Inspector_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_Hover.png b/indra/newview/skins/default/textures/windows/Inspector_Hover.png
new file mode 100644
index 0000000000..feeee78033
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Inspector_Hover.png
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 824df082d8..4463d44049 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -35,14 +35,14 @@
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -331,14 +331,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -586,14 +586,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -814,14 +814,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1002,14 +1002,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1223,14 +1223,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1444,14 +1444,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1665,14 +1665,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1886,14 +1886,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2119,14 +2119,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2340,14 +2340,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2561,14 +2561,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2782,14 +2782,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -3003,14 +3003,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -3305,14 +3305,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 467168ebd8..10bcee7c85 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -29,14 +29,14 @@
     </floater.string>
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="294"
      mouse_opaque="true"
      name="IconLocked"
      top="5"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
@@ -410,7 +410,7 @@
      width="330">
         Mark Item:
     </text-->
-    
+
 
     <!--radio_group
      draw_border="false"
@@ -438,7 +438,7 @@
          top_delta="0"
          width="70" />
     </radio_group-->
-    
+
     <!--text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index a767b40b03..3e2045e1f7 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -29,14 +29,14 @@
     </floater.string>
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="340"
      mouse_opaque="true"
      name="lock"
      top="1"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index cb3ff92363..ef68478460 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -26,14 +26,14 @@
      width="497" />
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="444"
      mouse_opaque="true"
      name="lock"
      top="3"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
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 6ba4d13117..311caa4866 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
@@ -16,28 +16,28 @@
      name="want_apply_text">
         Do you want to apply these changes?
     </panel.string>
-    
-    <button 
-     layout="topleft" 
-     name="back" 
-     right="-9" 
-     top="0" 
-     width="25" 
-     height="25" 
+
+    <button
+     layout="topleft"
+     name="back"
+     right="-9"
+     top="0"
+     width="25"
+     height="25"
      label=""
      follows="top|left"
      image_overlay="BackArrow_Off"
      tab_stop="false" />
-    <text 
-     layout="topleft" 
-     top="0" 
-     left="10" 
-     width="250" 
-     height="20" 
-     font="SansSerifHugeBold" 
-     text_color="white" 
+    <text
+     layout="topleft"
+     top="0"
+     left="10"
+     width="250"
+     height="20"
+     font="SansSerifHugeBold"
+     text_color="white"
      follows="top|left|right"
-     mouse_opaque="true" 
+     mouse_opaque="true"
      name="group_name">(Loading...)</text>
     <texture_picker
      follows="left|top"
@@ -81,15 +81,15 @@
      left="5"
      width="65" />
     <button
-	 top="632"
-	 left="75"	 
-	 height="20"
-     font="SansSerifSmall"
-     label="Refresh"
-     label_selected="Refresh"
+     follows="top|left"
+     height="20"
+     image_overlay="Refresh_Off"
+     layout="topleft"
      name="btn_refresh"
-	 follows="top|left"
-     width="65" />
+     picture_style="true"
+     top="632"
+     left="75"
+     width="20" />
     <button
      top="632"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3642b0fec1..efacac089e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -84,6 +84,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="nearby_view_sort_btn"
@@ -160,6 +161,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="friends_viewsort_btn"
@@ -173,6 +175,7 @@
                  height="18"
                  image_selected="AddItem_Press"
                  image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
                  layout="topleft"
                  left_pad="5"
                  name="add_btn"
@@ -186,6 +189,7 @@
                  height="18"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
+                 image_disabled="TrashItem_Disabled"
                  layout="topleft"
                  left_pad="180"
                  name="del_btn"
@@ -231,6 +235,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="gear_btn"
@@ -244,6 +249,7 @@
                  height="18"
                  image_selected="AddItem_Press"
                  image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
                  layout="topleft"
                  left_pad="5"
                  name="plus_btn"
@@ -290,7 +296,7 @@
          name="recent_panel"
          width="285">
             <avatar_list_tmp
-             color="DkGray2" 
+             color="DkGray2"
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
@@ -315,6 +321,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="recent_viewsort_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 389d3dbbc7..bceaedcdb4 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -46,6 +46,7 @@
              height="18"
              image_selected="OptionsMenu_Press"
              image_unselected="OptionsMenu_Off"
+              image_disabled="OptionsMenu_Disabled"
              layout="topleft"
              left="10"
              name="gear_menu_btn"
@@ -56,8 +57,7 @@
              follows="bottom|left"
              font="SansSerifBigBold"
              height="18"
-             image_disabled="AddItem_Off"
-             image_disabled_selected="AddItem_Press"
+             image_disabled="AddItem_Disabled"
              image_selected="AddItem_Press"
              image_unselected="AddItem_Off"
              layout="topleft"
@@ -71,8 +71,7 @@
              follows="bottom|right"
              font="SansSerifBigBold"
              height="18"
-             image_disabled="TrashItem_Off"
-             image_disabled_selected="TrashItem_Press"
+             image_disabled="TrashItem_Disabled"
              image_selected="TrashItem_Press"
              image_unselected="TrashItem_Off"
              layout="topleft"