diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index ac665250306..ae844dd22f8 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -39,7 +39,7 @@ static const std::string DD_BUTTON_NAME = "dd_button";
 static const std::string DD_TEXTBOX_NAME = "dd_textbox";
 static const std::string DD_HEADER_NAME = "dd_header";
 
-static const S32 HEADER_HEIGHT = 23;
+static const S32 HEADER_HEIGHT = 25;
 static const S32 HEADER_IMAGE_LEFT_OFFSET = 5;
 static const S32 HEADER_TEXT_LEFT_OFFSET = 30;
 static const F32 AUTO_OPEN_TIME = 1.f;
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index b534c8d4e82..350c1e6996e 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -1954,12 +1954,11 @@ void LLLineEditor::draw()
             width = llmin(width, mTextRightEdge - ll_round(rendered_pixels_right));
             gl_rect_2d(ll_round(rendered_pixels_right), cursor_top, ll_round(rendered_pixels_right)+width, cursor_bottom, color);
 
-            LLColor4 tmp_color( 1.f - text_color.mV[0], 1.f - text_color.mV[1], 1.f - text_color.mV[2], alpha );
             rendered_text += mFontBufferSelection.render(
                 mGLFont,
                 mText, mScrollHPos + rendered_text,
                 rendered_pixels_right, text_bottom,
-                tmp_color,
+                LLColor4::black,
                 LLFontGL::LEFT, LLFontGL::BOTTOM,
                 0,
                 LLFontGL::NO_SHADOW,
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index 97d23457789..ce236dec660 100644
--- a/indra/newview/llcolorswatch.cpp
+++ b/indra/newview/llcolorswatch.cpp
@@ -200,13 +200,14 @@ void LLColorSwatchCtrl::draw()
     F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
 
     mBorder->setKeyboardFocusHighlight(hasFocus());
-    // Draw border
-    LLRect border( 0, getRect().getHeight(), getRect().getWidth(), mLabelHeight );
-    gl_rect_2d( border, mBorderColor.get(), false );
 
-    LLRect interior = border;
+    LLRect gl_border(0, getRect().getHeight(), getRect().getWidth(), mLabelHeight);
+    LLColor4 gl_border_color = mBorderColor.get();
+    LLRect interior = gl_border;
     interior.stretch( -1 );
 
+    bool show_border_ctrl = true;
+
     // Check state
     if ( mValid )
     {
@@ -239,7 +240,9 @@ void LLColorSwatchCtrl::draw()
     {
         if (mFallbackImage.notNull())
         {
-            mFallbackImage->draw(interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), LLColor4::white % alpha);
+            mFallbackImage->draw(interior.mLeft - 1, interior.mBottom - 1, mFallbackImage->getWidth(), mFallbackImage->getHeight(), LLColor4::white % alpha);
+            gl_border_color = LLUIColorTable::instance().getColor("ColorSwatchBorderColorGray").get();
+            show_border_ctrl = false;
         }
         else
         {
@@ -250,6 +253,11 @@ void LLColorSwatchCtrl::draw()
         }
     }
 
+    mBorder->setVisible(show_border_ctrl);
+
+    // Draw border
+    gl_rect_2d(gl_border, gl_border_color, false);
+
     LLUICtrl::draw();
 }
 
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 3ab48f69c81..d7ffb88e35c 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1904,7 +1904,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         if (mColorSwatch)
         {
             mColorSwatch->setEnabled( false );
-            mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") );
+            mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image") );
             mColorSwatch->setValid(false);
         }
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 2ad285eb1ff..d5a001c5394 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -4,13 +4,13 @@
 	<!-- Named Colors -->
 	<color
 	 name="EmphasisColor"
-	 value="0.38 0.694 0.573 1" />
+	 value="0.3 0.82 1 1" />
 	<color
 	 name="EmphasisColor_13"
-	 value="0.38 0.694 0.573 0.13" />
+	 value="0.3 0.82 1 0.13" />
 	<color
 	 name="EmphasisColor_35"
-	 value="0.38 0.694 0.573 0.35" />
+	 value="0.3 0.82 1 0.35" />
 	<color
 	 name="BeaconColor"
     value="0.749 0.298 0 1" />	 
@@ -338,7 +338,7 @@
      reference="EmphasisColor" />
     <color
      name="ConversationFriendColor"
-     value="0.42 0.85 0.71 1" />
+     reference="EmphasisColor" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
@@ -359,7 +359,7 @@
      reference="Black" />
     <color
      name="FilterTextColor"
-     value="0.38 0.69 0.57 1" />
+     reference="EmphasisColor" />
      <color
      name="FloaterButtonImageColor"
      reference="LtGray" />
@@ -377,7 +377,7 @@
      reference="Black_50" />
     <color
      name="FocusColor"
-     reference="EmphasisColor" />
+     reference="white" />
     <color
      name="FolderViewLoadingMessageTextColor"
      value="0.3344 0.5456 0.5159 1" />
@@ -453,9 +453,6 @@
     <color
      name="InventoryBackgroundColor"
      reference="DkGray2" />
-    <color
-     name="InventoryFavoriteColor"
-     reference="Yellow" />
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
@@ -595,7 +592,7 @@
      reference="White" />
     <color
      name="NameTagFriend"
-     value="0.447 0.784 0.663 1" />
+     reference="EmphasisColor" />
     <color
      name="NameTagLegacy"
      reference="White" />
@@ -761,6 +758,9 @@
     <color
      name="SelectedOutfitTextColor"
      reference="EmphasisColor" />
+    <color
+     name="WornOutfitTextColor"
+     value="0.54 0.73 0.87 1" />
     <color
      name="SearchableControlHighlightFontColor"
      value="1 0 0 1" />
@@ -862,19 +862,25 @@
     <color
     name="ColorSwatchBorderColor"
     value="0.45098 0.517647 0.607843 1"/>
+    <color
+    name="ColorSwatchBorderColorGray"
+    value="0.329 0.329 0.329 1"/>
     <color
      name="ChatTeleportSeparatorColor"
      reference="Black" />
     <color
      name="ChatTimestampColor"
      reference="White" />
+    <color
+      name="MenuBarStreamingBgColor"
+      reference="DkGray" />
     <color
       name="MenuBarBetaBgColor"
       reference="DkBlue" />
-  <color
-     name="MenuBarProjectBgColor"
-     reference="MdBlue" />
-  <color
+    <color
+      name="MenuBarProjectBgColor"
+      reference="MdBlue" />
+    <color
       name="MenuBarTestBgColor"
       reference="DkRed" />
     <color
@@ -984,7 +990,7 @@
     value="1 0.14 0 1" />
   <color
     name="OutfitGalleryItemSelected"
-    value="0.22 0.45 0.35 1" />
+    value="0.26 0.36 0.47 1"/>
   <color
     name="OutfitGalleryItemWorn"
     value="0.33 0.58 0.47 1" />
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
index ffc3c85ea2a..2e84daaf6b3 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
index c8560c08694..1854cb87dfb 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
index 2812d614e6a..d009044ee14 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
index ae2c57c207c..a9415e9cc04 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
index 9f31d461b5f..f22f6e23b64 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
index f7ed4c25fb8..238d005bef0 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
index d0a825a682a..ad4a02ee27b 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
index 2f81fb1588b..1a134661eb7 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
index 4f86e81a155..8c5bf3bc667 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
index b211371e647..1eeab859e56 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
index e937c3f0122..57762defe47 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
index ed4902f3ee7..512bd3b64e2 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
index cd18ae310d6..b1012e505e0 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png and b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
index b0ed6ee8ebb..49cdadded7e 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png and b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
index be4881b64c1..9afe58dcd1b 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png and b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
index d50dc69ffe9..051c85d05da 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png and b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
index 3d6964530d1..3560b36ec64 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png and b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
index 3ed03899610..8f752aaf4cb 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png and b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
index 3ebd5ea7a1c..90844abe941 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png and b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
index 3bdc4d1fd5b..66e1c45567f 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png and b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
index 0912442e293..48ae5969a11 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png and b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
index 33db4a2de8c..eff8a231d64 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png and b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
index 9e80fe2b845..ab7921b97d9 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png and b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
index d36bfa55d44..446951d992d 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png and b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
index 962f6efb93a..a23e6dba507 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png and b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
index 715d597144e..daf39a658c4 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png and b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
index b2ea680f23b..28175f107e6 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png and b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
index 1fc22686eb9..049ca64f058 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png and b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
index 5bd87f8a2fb..8b45d668aaf 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png and b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png differ
diff --git a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
index a4c3f39e148..c94a984c41d 100644
Binary files a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png and b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png
index 0616dea6a34..ab852007ab5 100644
Binary files a/indra/newview/skins/default/textures/containers/Accordion_Selected.png and b/indra/newview/skins/default/textures/containers/Accordion_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png
new file mode 100644
index 00000000000..d6c6bc41ec6
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png
new file mode 100644
index 00000000000..cc310bbc262
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png
new file mode 100644
index 00000000000..177d341ba36
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png
new file mode 100644
index 00000000000..54bd4d923d1
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png
new file mode 100644
index 00000000000..28a315665bd
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png
new file mode 100644
index 00000000000..993e79b37f0
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png
new file mode 100644
index 00000000000..1f5d926cc8a
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png
new file mode 100644
index 00000000000..e4e4d27d426
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
index 642113b1358..62f82879cf8 100644
Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png differ
diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png
index 0efd596d3ec..1d00c2c175d 100644
Binary files a/indra/newview/skins/default/textures/icons/Info_Over.png and b/indra/newview/skins/default/textures/icons/Info_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
index 9af3b60cbda..19afa94cc4f 100644
Binary files a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png and b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
index 01e7dbff8fc..7ca0f5a8491 100644
Binary files a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png and b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png differ
diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png
index 1eafc304f58..7b147df369d 100644
Binary files a/indra/newview/skins/default/textures/icons/SL_Logo.png and b/indra/newview/skins/default/textures/icons/SL_Logo.png differ
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png
index ab82dfc0a79..0c962574707 100644
Binary files a/indra/newview/skins/default/textures/icons/back_arrow_off.png and b/indra/newview/skins/default/textures/icons/back_arrow_off.png differ
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png
index ad8c1f8d2c2..a7fac5ef996 100644
Binary files a/indra/newview/skins/default/textures/icons/back_arrow_over.png and b/indra/newview/skins/default/textures/icons/back_arrow_over.png differ
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png
index 8aecc3d876c..0c962574707 100644
Binary files a/indra/newview/skins/default/textures/icons/back_arrow_press.png and b/indra/newview/skins/default/textures/icons/back_arrow_press.png differ
diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png
index 5431dd31c80..00ec32964df 100644
Binary files a/indra/newview/skins/default/textures/icons/check_mark.png and b/indra/newview/skins/default/textures/icons/check_mark.png differ
diff --git a/indra/newview/skins/default/textures/icons/hand.png b/indra/newview/skins/default/textures/icons/hand.png
index d8ef2e22fa3..6effb7c77d3 100644
Binary files a/indra/newview/skins/default/textures/icons/hand.png and b/indra/newview/skins/default/textures/icons/hand.png differ
diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
index 4059035b20c..51d369003c1 100644
Binary files a/indra/newview/skins/default/textures/icons/see_me_online.png and b/indra/newview/skins/default/textures/icons/see_me_online.png differ
diff --git a/indra/newview/skins/default/textures/locked_image_dark.png b/indra/newview/skins/default/textures/locked_image_dark.png
new file mode 100644
index 00000000000..b952f2cfb07
Binary files /dev/null and b/indra/newview/skins/default/textures/locked_image_dark.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
index e27dbe2cadc..cbb78cd5149 100644
Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
index 7909d54f2b5..6b4092bf49e 100644
Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png
index fc4f0c07eff..0eeb4f494cb 100644
Binary files a/indra/newview/skins/default/textures/navbar/Row_Selection.png and b/indra/newview/skins/default/textures/navbar/Row_Selection.png differ
diff --git a/indra/newview/skins/default/textures/square_selection.png b/indra/newview/skins/default/textures/square_selection.png
new file mode 100644
index 00000000000..9f344c4842e
Binary files /dev/null and b/indra/newview/skins/default/textures/square_selection.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d650e7e791b..29a879168d4 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -648,6 +648,8 @@ with the same filename but different name
   <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" />
   <texture name="Unknown_Icon" file_name="icons/unknown_icon.png" preload="true" />
 
+  <texture name="Square_Selection" file_name="square_selection.png" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
+
   <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="Snapshot_Download" file_name="snapshot_download.png" preload="false" />
   <texture name="Snapshot_Email" file_name="snapshot_email.png" preload="false" />
@@ -685,6 +687,15 @@ with the same filename but different name
   <texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="false" />
   <texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="false" />
 
+  <texture name="TabLeft_Flat_Off" file_name="containers/TabLeft_Flat_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="TabLeft_Flat_Selected" file_name="containers/TabLeft_Flat_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="TabTop_First_Flat_Off" file_name="containers/TabTop_First_Flat_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Last_Flat_Off" file_name="containers/TabTop_Last_Flat_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Middle_Flat_Off" file_name="containers/TabTop_Middle_Flat_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_First_Flat_Selected" file_name="containers/TabTop_First_Flat_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Last_Flat_Selected" file_name="containers/TabTop_Last_Flat_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Middle_Flat_Selected" file_name="containers/TabTop_Middle_Flat_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+
   <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Flashing" file_name="containers/TabTop_Right_Flashing.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
@@ -702,6 +713,7 @@ with the same filename but different name
   <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Highlight" file_name="widgets/TextField_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
   <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
@@ -864,6 +876,7 @@ with the same filename but different name
   <texture name="badge_warn.j2c" />
   <texture name="badge_ok.j2c" />
   <texture name="materials_ui_x_24.png" />
+  <texture name="locked_image" file_name="locked_image_dark.png" preload="true"/>
 
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
   <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
index 8439f82e293..383ff8f6e39 100644
Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png and b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
index cb9a04d84fb..66f12496cbf 100644
Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png and b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
index 0ec090504a1..549bbde5cd7 100644
Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_On.png and b/indra/newview/skins/default/textures/widgets/Checkbox_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
index 5759f7de695..9c80670837b 100644
Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
index ba46e91c55f..903c61f01bb 100644
Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
index 5f5a33d878a..96dfd7267c4 100644
Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png and b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
index ebeb8133494..5b2bc7b1632 100644
Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
index 4f573cf6fa6..7199470307a 100644
Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
index 1a834bfbbc7..715b401ce5c 100644
Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
index 5a067aca7cf..9e74524be47 100644
Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png and b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
index ff563671479..aa8865c33d8 100644
Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png and b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
index 9a69f7e0d9a..fff0cfaff25 100644
Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png and b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
index b118e7a7d40..9f6a2313b91 100644
Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Off.png and b/indra/newview/skins/default/textures/widgets/DropDown_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png
index 613a8c2ff6e..a4984659403 100644
Binary files a/indra/newview/skins/default/textures/widgets/DropDown_On.png and b/indra/newview/skins/default/textures/widgets/DropDown_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
index fa3a152df1c..b6bf4d1c220 100644
Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Press.png and b/indra/newview/skins/default/textures/widgets/DropDown_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png
index e72c1c40207..9316567e7b7 100644
Binary files a/indra/newview/skins/default/textures/widgets/ListItem_Over.png and b/indra/newview/skins/default/textures/widgets/ListItem_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png
index 0e16a8b454b..cd65d347d62 100644
Binary files a/indra/newview/skins/default/textures/widgets/ListItem_Select.png and b/indra/newview/skins/default/textures/widgets/ListItem_Select.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index de71f763d3e..b2767c61747 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index 8bfa3acb42b..de50b29f798 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
index e99ec4b14bf..64a9a2d8853 100644
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png and b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
index 29eeed7c78a..113c371a4d5 100644
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Off.png and b/indra/newview/skins/default/textures/widgets/PushButton_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png
index 65d92a9d82f..db70f75dd6f 100644
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_On.png and b/indra/newview/skins/default/textures/widgets/PushButton_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
index 819f27c0ba1..67dfa0ca75b 100644
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Over.png and b/indra/newview/skins/default/textures/widgets/PushButton_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
index b0a92d8ffe2..8dfa9030b10 100644
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Press.png and b/indra/newview/skins/default/textures/widgets/PushButton_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
index 8588576fb0b..062fcf92469 100644
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
index 32ec25fe0e2..fb98907be29 100644
Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png and b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
index 5d267af5dcf..231aead6519 100644
Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png and b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
index e6bf0db1575..066872ff82e 100644
Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_On.png and b/indra/newview/skins/default/textures/widgets/RadioButton_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
index 72aae43618b..43af5bec2fc 100644
Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
index f3883b82b3c..6870a48129b 100644
Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
index 0025256045c..0fb0054bfbc 100644
Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png and b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
index 9afc907c1c1..eb9563e0ee7 100644
Binary files a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
index ede643e528e..144a7cba25e 100644
Binary files a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
index d9f05d33ec1..8ad008ba51f 100644
Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
index d2342f6538c..ca5f84a0886 100644
Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
index 6223ad8dfec..9b1531a11e7 100644
Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
index 101d5a0930b..28f5bf37f76 100644
Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
index 5cfa3ae4e11..fb98907be29 100644
Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
index 66cdcbeb94e..231aead6519 100644
Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
index 0bf8e43e818..0fb0054bfbc 100644
Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
index 720830f83f1..65cfaf4c623 100644
Binary files a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png and b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
index 51d269bd45f..720946aba68 100644
Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png and b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
index b4f19b7dbb3..505fa6c82c5 100644
Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png and b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
index a01d928aef2..9482e4773e0 100644
Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png and b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
index d5b672d9437..ca311768c42 100644
Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png and b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Highlight.png b/indra/newview/skins/default/textures/widgets/TextField_Highlight.png
new file mode 100644
index 00000000000..71c2a5dbc35
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Highlight.png differ
diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
index 03d1e805e13..1e2ce7bc834 100644
Binary files a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png and b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png differ
diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
index cdc52fe08ae..25f2914eccb 100644
Binary files a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png and b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png differ
diff --git a/indra/newview/skins/default/textures/widgets/track_control_sphere.png b/indra/newview/skins/default/textures/widgets/track_control_sphere.png
index 60a81d1fea7..adfb51edd2c 100644
Binary files a/indra/newview/skins/default/textures/widgets/track_control_sphere.png and b/indra/newview/skins/default/textures/widgets/track_control_sphere.png differ
diff --git a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png
index b3191ccc5da..98bae903321 100644
Binary files a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png and b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png differ
diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png
index 843f6e9fbe8..d51cf430514 100644
Binary files a/indra/newview/skins/default/textures/windows/Inspector_I.png and b/indra/newview/skins/default/textures/windows/Inspector_I.png differ
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
index 9864ec0db85..83a09584c1f 100644
Binary files a/indra/newview/skins/default/textures/windows/Window_Background.png and b/indra/newview/skins/default/textures/windows/Window_Background.png differ
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
index a86b236504f..1f4f9040bc3 100644
Binary files a/indra/newview/skins/default/textures/windows/Window_Foreground.png and b/indra/newview/skins/default/textures/windows/Window_Foreground.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 4b0e0bb2214..b7d992bcb44 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -82,8 +82,8 @@
      name="pref core"
      tab_group="1"
      tab_position="left"
-     tab_width="140"
-     tab_padding_right="0"
+     tab_width="136"
+     tab_padding_right="4"
      top="40"
      width="658">
         <panel
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 85cf4419a39..4d924a6c244 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -89,7 +89,7 @@
 	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
-	         left="10"
+	         left="9"
 	         name="back_btn"
 	         tool_tip="Go back to previous location"
 	         top="2"
@@ -102,7 +102,7 @@
 	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
-	         left_pad="0"
+	         left_pad="1"
 	         name="forward_btn"
 	         tool_tip="Go forward one location"
 	         top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index bf07ae4d686..1e6d5dabc80 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -121,7 +121,7 @@
       Better
   </text>
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -130,7 +130,7 @@
     top_delta="-2"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -138,7 +138,7 @@
     name="LowMidGraphicsDivet"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -147,7 +147,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -156,7 +156,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -165,7 +165,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -174,7 +174,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 52413abe74a..ab5709e8ee5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -603,7 +603,7 @@
    label="Voice Input/Output devices"
    layout="topleft"
    left="20"
-   top_pad="0"
+   top_pad="1"
    name="device_settings_btn"
    width="200">
   </button>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index a16b0b58dae..62254644924 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -50,24 +50,14 @@ width="333">
       layout="topleft"
       name="openoutfit_btn"
       visible="false" />
-      <icon
-      follows="top|left"
-      height="31"
-      image_name="Shirt_Large"
-      name="outfit_icon"
-      mouse_opaque="false"
-      visible="true"
-      left="1"
-      top="0"
-      width="31" />
       <text
-      font="SansSerifSmall"
+      font="SansSerifSmallBold"
       text_color="EmphasisColor"
       width="300"
       height="13"
       follows="top|left|right"
       layout="topleft"
-      left="35"
+      left="5"
       top="3"
       mouse_opaque="false"
       name="currentlook_status" >
@@ -76,7 +66,7 @@ width="333">
       <text
       font="SansSerifLargeBold"
       height="20"
-      left="35"
+      left="5"
       parse_urls="false"
       text_color="White"
       top="15"
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 090447a6a2f..6836f9e6366 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -11,7 +11,7 @@
         image_top_pad="0"
         image_bottom_pad="0"
         imgoverlay_label_space="1"
-        label_color="ButtonLabelColor"
+        label_color="White"
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
         label_color_disabled_selected="ButtonLabelSelectedDisabledColor"
@@ -24,6 +24,7 @@
         pad_bottom="1"
         height="23"
         scale_image="true"
+        label_shadow="false"
         handle_right_mouse="true"
         use_draw_context_alpha="true"
         held_down_delay.seconds="0.5"
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index 604f62b099e..3a0f43de3d8 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -7,10 +7,10 @@
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"
   highlight_text_field="true"
-  background_image="TextField_Search_Off"
-  background_image_disabled="TextField_Search_Disabled"
-  background_image_focused="TextField_Search_Active"
-  background_image_highlight="TextField_Search_Highlight">
+  background_image="TextField_Off"
+  background_image_disabled="TextField_Disabled"
+  background_image_focused="TextField_Active"
+  background_image_highlight="TextField_Highlight">
   <search_button label=""
     top_pad="4"
     left_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index 50c5285e04c..3b20e3a908f 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -6,7 +6,7 @@
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
-  selection_image="Rounded_Square"
+  selection_image="Square_Selection"
   mouse_opaque="true"
   follows="left|top|right"
   left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 865c145022c..41ef9d2b8ac 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -6,7 +6,7 @@
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
-  selection_image="Rounded_Square"
+  selection_image="Square_Selection"
   left_pad="5"
   icon_pad="2"
   icon_width="16"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
index 09cbb1d3abc..ad4249da4ed 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
@@ -2,7 +2,7 @@
 <inbox_folder_view_item
   item_height="20" 
   item_top_pad="4"
-  selection_image="Rounded_Square"
+  selection_image="Square_Selection"
   >
 	<new_badge 
         label="New" 
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
index ce36a39a214..b00b8a241b3 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
@@ -17,7 +17,7 @@
   <worn_style
    font="SansSerifSmall"
    font.style="BOLD"
-   color="EmphasisColor" />
+   color="WornOutfitTextColor" />
   <item_icon
     height="16"
     follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 51144c92b6c..8294b967993 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -8,10 +8,10 @@
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"
   highlight_text_field="true"
-  background_image="TextField_Search_Off"
-  background_image_disabled="TextField_Search_Disabled"
-  background_image_focused="TextField_Search_Active"
-  background_image_highlight="TextField_Search_Highlight">
+  background_image="TextField_Off"
+  background_image_disabled="TextField_Disabled"
+  background_image_focused="TextField_Active"
+  background_image_highlight="TextField_Highlight">
   <search_button 
     top_pad="4"
     left_pad="4" 
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index b99010e17a4..6b7ba9d58a1 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -15,7 +15,7 @@
   default_color="TextDefaultColor"
   text_color="TextFgColor"
   text_readonly_color="TextFgReadOnlyColor"
-  text_selected_color="White" 
+  text_selected_color="Black" 
   h_pad="6" 
   v_pad="4"
   bg_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 22955fe73d5..e3b9030280c 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -19,22 +19,22 @@ label_pad_left - padding to the left of tab button labels
   tab_left_image_flash
   tab_top_image_flash
   -->
-  <first_tab tab_top_image_unselected="TabTop_Left_Off"
-               tab_top_image_selected="TabTop_Left_Selected"
+  <first_tab tab_top_image_unselected="TabTop_First_Flat_Off"
+               tab_top_image_selected="TabTop_First_Flat_Selected"
                tab_bottom_image_unselected="Toolbar_Left_Off"
                tab_bottom_image_selected="Toolbar_Left_Selected"
-               tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
-  <middle_tab tab_top_image_unselected="TabTop_Middle_Off"
-               tab_top_image_selected="TabTop_Middle_Selected"
+               tab_left_image_unselected="TabLeft_Flat_Off"
+               tab_left_image_selected="TabLeft_Flat_Selected"/>
+  <middle_tab tab_top_image_unselected="TabTop_Middle_Flat_Off"
+               tab_top_image_selected="TabTop_Middle_Flat_Selected"
                tab_bottom_image_unselected="Toolbar_Middle_Off"
                tab_bottom_image_selected="Toolbar_Middle_Selected"
-               tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
-  <last_tab tab_top_image_unselected="TabTop_Right_Off"
-               tab_top_image_selected="TabTop_Right_Selected"
+               tab_left_image_unselected="TabLeft_Flat_Off"
+               tab_left_image_selected="TabLeft_Flat_Selected"/>
+  <last_tab tab_top_image_unselected="TabTop_Last_Flat_Off"
+               tab_top_image_selected="TabTop_Last_Flat_Selected"
                tab_bottom_image_unselected="Toolbar_Right_Off"
                tab_bottom_image_selected="Toolbar_Right_Selected"
-               tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_unselected="TabLeft_Flat_Off"
+               tab_left_image_selected="TabLeft_Flat_Selected"/>
 </tab_container>
diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
index aa235e103bc..0f927f8bb3d 100644
--- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
@@ -17,7 +17,7 @@
   <worn_style
    font="SansSerifSmall"
    font.style="BOLD"
-   color="EmphasisColor" />
+   color="WornOutfitTextColor" />
   <item_icon
     height="16"
     follows="top|left"