Merge tag 'Second_Life_Release#8ffb73b4-26.2' into 2026.02

author: Erik Kundiman <erik@megapahit.org> 2026-04-19 08:50:43 +0800
committer: Erik Kundiman <erik@megapahit.org> 2026-04-19 08:51:40 +0800
commit: badf783df47cb08de85a7abfa612ce813628058d (patch)
tree: f083ba78912ff61645706d14060b6fe37f91b458 /indra
parent: 7d73db9236774e45240602395f544e19ac10bef7 (diff)
parent: 8ffb73b4c0f5141d03cbbdfa8213421effed8eb0 (diff)
240 files changed, 1906 insertions, 1613 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index af13746c91..abd4c85bc7 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -20,4 +20,5 @@ if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR
 use_prebuilt_binary(nanosvg)
 endif ()
 use_prebuilt_binary(viewer-fonts)
+use_prebuilt_binary(google-fonts)
 use_prebuilt_binary(emoji_shortcodes)
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 53a338b3d6..34f1b83b6d 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1658,3 +1658,15 @@ void LLPluginClassMedia::initializeUrlHistory(const LLSD& url_history)
 
     LL_DEBUGS("Plugin") << "Sending history" << LL_ENDL;
 }
+
+void LLPluginClassMedia::forceRenderRefresh()
+{
+    // Force layout recalculation by briefly hiding/showing the web content
+    // Used to clear black screen issues after resize, see #5607
+    const std::string refresh_script =
+        "document.documentElement.style.visibility='hidden';"
+        "document.documentElement.offsetHeight;"
+        "document.documentElement.style.visibility='';";
+
+    executeJavaScript(refresh_script);
+}
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 6c512003cc..91901719d3 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -356,6 +356,8 @@ public:
 
     std::shared_ptr<LLPluginClassMedia> getSharedPtr() { return std::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this
 
+    void forceRenderRefresh();
+
 protected:
 
     LLPluginClassMediaOwner *mOwner;
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 9d6773ac5b..799e907027 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -143,6 +143,7 @@ LLFontFreetype::LLFontFreetype()
     mDescender(0.f),
     mLineHeight(0.f),
     mIsFallback(false),
+    mHinting(EFontHinting::FORCE_AUTOHINT),
     mFTFace(nullptr),
     mRenderGlyphCount(0),
     mStyle(0),
@@ -166,7 +167,7 @@ LLFontFreetype::~LLFontFreetype()
     // mFallbackFonts cleaned up by LLPointer destructor
 }
 
-bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n)
+bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags)
 {
     // Don't leak face objects.  This is also needed to deal with
     // changed font file names.
@@ -190,6 +191,8 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
         return false;
 
     mIsFallback = is_fallback;
+    mHinting = hinting;
+    mFontFlags = flags;
     F32 pixels_per_em = (point_size / 72.f)*vert_dpi; // Size in inches * dpi
 
     error = FT_Set_Char_Size(mFTFace,    /* handle to face object           */
@@ -245,6 +248,12 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
     {
         mStyle |= LLFontGL::BOLD;
     }
+    else if (flags & LLFontGL::BOLD)
+    {
+        // FontGL applies programmatic bolding to fonts that are a part of 'bold' descriptor but don't have the bold style set.
+        // Ex: Inter SemiBold doesn't have FT_STYLE_FLAG_BOLD and without this style it would be bolded programmatically.
+        mStyle |= LLFontGL::BOLD;
+    }
 
     if(mFTFace->style_flags & FT_STYLE_FLAG_ITALIC)
     {
@@ -352,7 +361,12 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const
 
     llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta));
 
-    return delta.x*(1.f/64.f);
+    if (mFTFace->face_flags & FT_FACE_FLAG_SCALABLE)
+    {
+        // Return the X advance
+        return (F32)(delta.x * (1.0 / 64.0));
+    }
+    return (F32)delta.x;
 }
 
 F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const
@@ -367,7 +381,12 @@ F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LL
 
     llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta));
 
-    return delta.x*(1.f/64.f);
+    if (mFTFace->face_flags & FT_FACE_FLAG_SCALABLE)
+    {
+        // Return the X advance
+        return (F32)(delta.x * (1.0 / 64.0));
+    }
+    return (F32)delta.x;
 }
 
 bool LLFontFreetype::hasGlyph(llwchar wch) const
@@ -637,7 +656,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll
     if (mFTFace == nullptr)
         return;
 
-    FT_Int32 load_flags = FT_LOAD_FORCE_AUTOHINT;
+    FT_Int32 load_flags = (FT_Int32)mHinting;
     if (EFontGlyphType::Color == bitmap_type)
     {
         // We may not actually get a color render so our caller should always examine mFTFace->glyph->bitmap.pixel_mode
@@ -680,7 +699,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll
 void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
 {
     resetBitmapCache();
-    loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0);
+    loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0, mHinting, mFontFlags);
     if (!mIsFallback)
     {
         // This is the head of the list - need to rebuild ourself and all fallbacks.
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index f7600e40a3..96f99fd31c 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -43,6 +43,7 @@ struct FT_FaceRec_;
 typedef struct FT_FaceRec_* LLFT_Face;
 struct FT_StreamRec_;
 typedef struct FT_StreamRec_ LLFT_Stream;
+enum class EFontHinting : S32;
 
 namespace ll
 {
@@ -100,7 +101,7 @@ public:
 
     // is_fallback should be true for fallback fonts that aren't used
     // to render directly (Unicode backup, primarily)
-    bool loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n);
+    bool loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags);
 
     S32 getNumFaces(const std::string& filename);
 
@@ -164,7 +165,11 @@ private:
     bool setSubImageBGRA(U32 x, U32 y, U32 bitmap_num, U16 width, U16 height, const U8* data, U32 stride) const;
     bool hasGlyph(llwchar wch) const;       // Has a glyph for this character
     LLFontGlyphInfo* addGlyph(llwchar wch, EFontGlyphType glyph_type) const;        // Add a new character to the font if necessary
-    LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
+    LLFontGlyphInfo* addGlyphFromFont(
+        const LLFontFreetype *fontp,
+        llwchar wch,
+        U32 glyph_index,
+        EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
     void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, llwchar wch) const;
     void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const;
 
@@ -180,6 +185,8 @@ private:
     LLFT_Face mFTFace;
 
     bool mIsFallback;
+    EFontHinting mHinting;
+    S32 mFontFlags;
     typedef std::pair<LLPointer<LLFontFreetype>, char_functor_t> fallback_font_t;
     typedef std::vector<fallback_font_t> fallback_font_vector_t;
     fallback_font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars)
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 16eec1fdd2..d95eea526b 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -90,14 +90,14 @@ void LLFontGL::destroyGL()
     mFontFreetype->destroyGL();
 }
 
-bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n)
+bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags)
 {
     if(mFontFreetype == reinterpret_cast<LLFontFreetype*>(NULL))
     {
         mFontFreetype = new LLFontFreetype;
     }
 
-    return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n);
+    return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n, hinting, flags);
 }
 
 S32 LLFontGL::getNumFaces(const std::string& filename)
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 1c8e036f58..652cec8e5b 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -87,7 +87,7 @@ public:
 
     void destroyGL();
 
-    bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n);
+    bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags);
 
     S32 getNumFaces(const std::string& filename);
     S32 getCacheGeneration() const;
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index c48a389f6a..370b08319f 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -181,16 +181,16 @@ LLFontDescriptor LLFontDescriptor::normalize() const
     return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles());
 }
 
-void LLFontDescriptor::addFontFile(const std::string& file_name, const std::string& char_functor)
+void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor)
 {
     char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor);
-    mFontFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr));
+    mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, size_delta, (mCharFunctors.end() != it) ? it->second : nullptr));
 }
 
-void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, const std::string& char_functor)
+void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor)
 {
     char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor);
-    mFontCollectionFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr));
+    mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, size_delta, (mCharFunctors.end() != it) ? it->second : nullptr));
 }
 
 LLFontRegistry::LLFontRegistry(bool create_gl_textures)
@@ -289,23 +289,63 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc)
         {
             std::string font_file_name = child->getTextContents();
             std::string char_functor;
+            EFontHinting hinting = EFontHinting::FORCE_AUTOHINT;
+            S32 flags = 0;
 
             if (child->hasAttribute("functor"))
             {
                 child->getAttributeString("functor", char_functor);
             }
 
+            if (child->hasAttribute("font_hinting"))
+            {
+                std::string attr_hinting;
+                child->getAttributeString("font_hinting", attr_hinting);
+                LLStringUtil::toLower(attr_hinting);
+
+                if (attr_hinting == "default")
+                {
+                    hinting = EFontHinting::DEFAULT;
+                }
+                else if (attr_hinting == "force_auto")
+                {
+                    hinting = EFontHinting::FORCE_AUTOHINT;
+                }
+                else if (attr_hinting == "no_hinting")
+                {
+                    hinting = EFontHinting::NO_HINTING;
+                }
+            }
+
+            if (child->hasAttribute("flags"))
+            {
+                std::string attr_flags;
+                child->getAttributeString("flags", attr_flags);
+                LLStringUtil::toLower(attr_flags);
+
+                if (attr_flags == "bold")
+                {
+                    flags |= LLFontGL::BOLD;
+                }
+            }
+
+            F32 size_delta = 0.f;
+            if (child->hasAttribute("size_delta"))
+            {
+                child->getAttributeF32("size_delta", size_delta);
+            }
+
             if (child->hasAttribute("load_collection"))
             {
                 bool col = false;
                 child->getAttributeBOOL("load_collection", col);
                 if (col)
                 {
-                    desc.addFontCollectionFile(font_file_name, char_functor);
+                    desc.addFontCollectionFile(font_file_name, hinting, flags, size_delta, char_functor);
                 }
             }
 
-            desc.addFontFile(font_file_name, char_functor);
+            desc.addFontFile(font_file_name, hinting, flags, size_delta, char_functor);
         }
         else if (child->hasName("os"))
         {
@@ -462,7 +502,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
     // Add ultimate fallback list - generated dynamically on linux,
     // null elsewhere.
     std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files),
-                   [](const std::string& file_name) { return LLFontFileInfo(file_name); });
+                   [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0, 0.f); });
 
     // Load fonts based on names.
     if (font_files.empty())
@@ -517,8 +557,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
                 {
                     fontp = new LLFontGL;
                 }
-                if (fontp->loadFace(font_path, point_size_scale,
-                                 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i))
+                if (fontp->loadFace(font_path, point_size_scale + font_file_it->mSizeDelta,
+                                 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i, font_file_it->mHinting, font_file_it->mFlags))
                 {
                     is_font_loaded = true;
                     if (is_first_found)
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index 8bbf5aa30c..a5fa9f338a 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -34,22 +34,42 @@ class LLFontGL;
 
 typedef std::vector<std::string> string_vec_t;
 
+enum class EFontHinting : S32
+{
+    DEFAULT = 0,
+    NO_HINTING = 0x8000U,
+    FORCE_AUTOHINT = 0x20,
+};
+
 struct LLFontFileInfo
 {
-    LLFontFileInfo(const std::string& file_name, const std::function<bool(llwchar)>& char_functor = nullptr)
+    LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::function<bool(llwchar)>& char_functor = nullptr)
         : FileName(file_name)
         , CharFunctor(char_functor)
+        , mHinting(hinting)
+        , mFlags(flags)
+        , mSizeDelta(size_delta)
     {
     }
 
-    LLFontFileInfo(const LLFontFileInfo& ffi)
+    LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags, F32 size_delta)
         : FileName(ffi.FileName)
         , CharFunctor(ffi.CharFunctor)
+        , mHinting(hinting)
+        , mFlags(flags)
+        , mSizeDelta(size_delta)
     {
     }
 
     std::string FileName;
     std::function<bool(llwchar)> CharFunctor;
+    EFontHinting mHinting;
+    S32 mFlags;
+
+    // Not all fonts are the same size, Ex: dejavu is bigger than inter,
+    // so in some cases we want to adjust relative sizes to make characters
+    // from different files match.
+    F32 mSizeDelta;
 };
 typedef std::vector<LLFontFileInfo> font_file_info_vec_t;
 
@@ -71,10 +91,10 @@ public:
     const std::string& getSize() const { return mSize; }
     void setSize(const std::string& size) { mSize = size; }
 
-    void addFontFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null);
+    void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor = LLStringUtil::null);
     const font_file_info_vec_t & getFontFiles() const { return mFontFiles; }
     void setFontFiles(const font_file_info_vec_t& font_files) { mFontFiles = font_files; }
-    void addFontCollectionFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null);
+    void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor = LLStringUtil::null);
     const font_file_info_vec_t& getFontCollectionFiles() const { return mFontCollectionFiles; }
     void setFontCollectionFiles(const font_file_info_vec_t& font_collection_files) { mFontCollectionFiles = font_collection_files; }
 
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 828bfb289b..fa9de1eb09 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/llbutton.cpp b/indra/llui/llbutton.cpp
index 0048c44189..7f209c60a7 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -85,6 +85,7 @@ LLButton::Params::Params()
     image_top_pad("image_top_pad"),
     image_bottom_pad("image_bottom_pad"),
     imgoverlay_label_space("imgoverlay_label_space", 1),
+    image_overlay_right_delta("image_overlay_right_delta", 0),
     label_color("label_color"),
     label_color_selected("label_color_selected"),   // requires is_toggle true
     label_color_disabled("label_color_disabled"),
@@ -109,6 +110,8 @@ LLButton::Params::Params()
     commit_on_capture_lost("commit_on_capture_lost", false),
     display_pressed_state("display_pressed_state", true),
     use_draw_context_alpha("use_draw_context_alpha", true),
+    draw_focus_border("draw_focus_border", true),
+    hover_hand_cursor("hover_hand_cursor", false),
     badge("badge"),
     handle_right_mouse("handle_right_mouse"),
     held_down_delay("held_down_delay"),
@@ -158,6 +161,7 @@ LLButton::LLButton(const LLButton::Params& p)
     mImageOverlayTopPad(p.image_top_pad),
     mImageOverlayBottomPad(p.image_bottom_pad),
     mImgOverlayLabelSpace(p.imgoverlay_label_space),
+    mImageOverlayRightDelta(p.image_overlay_right_delta),
     mIsToggle(p.is_toggle),
     mScaleImage(p.scale_image),
     mDropShadowedText(p.label_shadow),
@@ -179,6 +183,8 @@ LLButton::LLButton(const LLButton::Params& p)
     mMouseUpSignal(NULL),
     mHeldDownSignal(NULL),
     mUseDrawContextAlpha(p.use_draw_context_alpha),
+    mDrawFocusBorder(p.draw_focus_border),
+    mHoverHandCursor(p.hover_hand_cursor),
     mHandleRightMouse(p.handle_right_mouse),
     mFlashingTimer(NULL)
 {
@@ -653,7 +659,7 @@ bool LLButton::handleHover(S32 x, S32 y, MASK mask)
         }
 
         // We only handle the click if the click both started and ended within us
-        getWindow()->setCursor(UI_CURSOR_ARROW);
+        getWindow()->setCursor(mHoverHandCursor ? UI_CURSOR_HAND : UI_CURSOR_ARROW);
         LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL;
     }
     return true;
@@ -840,10 +846,9 @@ void LLButton::draw()
         label_color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // overlay with keyboard focus border
-    if (hasFocus())
+    if (hasFocus() && mDrawFocusBorder)
     {
-        F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
-        drawBorder(imagep, gFocusMgr.getFocusColor() % alpha, ll_round(lerp(1.f, 3.f, lerp_amt)));
+        drawBorder(imagep, gFocusMgr.getFocusColor() % alpha, gFocusMgr.getFocusFlashWidth());
     }
 
     if (use_glow_effect)
@@ -930,6 +935,17 @@ void LLButton::draw()
         }
         overlay_color.mV[VALPHA] *= alpha;
 
+        if (mImageOverlayRightDelta > 0)
+        {
+            mImageOverlay->draw(getRect().getWidth() - overlay_width - mImageOverlayRightDelta,
+                            center_y - (overlay_height / 2),
+                            overlay_width,
+                            overlay_height,
+                            overlay_color);
+        }
+        else
+        {
+
         switch(mImageOverlayAlignment)
         {
         case LLFontGL::LEFT:
@@ -964,6 +980,7 @@ void LLButton::draw()
             // draw nothing
             break;
         }
+        }
     }
 
     // Draw label
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index f530eceb4b..0d1a28ee31 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -110,6 +110,7 @@ public:
         //image overlay paddings
         Optional<S32>           image_top_pad;
         Optional<S32>           image_bottom_pad;
+        Optional<S32>           image_overlay_right_delta;
 
         /**
          * Space between image_overlay and label
@@ -132,7 +133,9 @@ public:
         Optional<F32>               hover_glow_amount;
         Optional<TimeIntervalParam> held_down_delay;
 
-        Optional<bool>              use_draw_context_alpha;
+        Optional<bool>              use_draw_context_alpha,
+                                    draw_focus_border,
+                                    hover_hand_cursor;
 
         Optional<LLBadge::Params>   badge;
 
@@ -366,12 +369,16 @@ protected:
     S32                         mImageOverlayBottomPad;
 
     bool                        mUseDrawContextAlpha;
+    bool                        mDrawFocusBorder;
+    bool                        mHoverHandCursor;
 
     /*
      * Space between image_overlay and label
      */
     S32                         mImgOverlayLabelSpace;
 
+    S32                         mImageOverlayRightDelta;
+
     F32                         mHoverGlowStrength;
     F32                         mCurGlowStrength;
 
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp
index 15536178ab..b3b47084c5 100644
--- a/indra/llui/lldraghandle.cpp
+++ b/indra/llui/lldraghandle.cpp
@@ -59,7 +59,9 @@ LLDragHandle::LLDragHandle(const LLDragHandle::Params& p)
     mMaxTitleWidth( 0 ),
     mForeground( true ),
     mDragHighlightColor(p.drag_highlight_color()),
-    mDragShadowColor(p.drag_shadow_color())
+    mDragShadowColor(p.drag_shadow_color()),
+    mFont(p.font),
+    mLabelVPad(p.label_vpad())
 
 {
     static LLUICachedControl<S32> snap_margin ("SnapMargin", 0);
@@ -98,14 +100,13 @@ void LLDragHandleTop::setTitle(const std::string& title)
     }
     else
     {
-        const LLFontGL* font = LLFontGL::getFontSansSerif();
         LLTextBox::Params params;
         params.name("Drag Handle Title");
         params.rect(getRect());
         params.initial_value(trimmed_title);
-        params.font(font);
+        params.font(mFont);
         params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
-        params.font_shadow(LLFontGL::DROP_SHADOW_SOFT);
+        params.font_shadow(LLFontGL::NO_SHADOW);
         params.use_ellipses = true;
         params.parse_urls = false; //cancel URL replacement in floater title
         mTitleBox = LLUICtrlFactory::create<LLTextBox> (params);
@@ -236,7 +237,6 @@ void LLDragHandleLeft::draw()
 
 void LLDragHandleTop::reshapeTitleBox()
 {
-    static LLUICachedControl<S32> title_vpad("UIFloaterTitleVPad", 0);
     if( ! mTitleBox)
     {
         return;
@@ -248,7 +248,7 @@ void LLDragHandleTop::reshapeTitleBox()
     LLRect title_rect;
     title_rect.setLeftTopAndSize(
         LEFT_PAD,
-        getRect().getHeight() - title_vpad,
+        getRect().getHeight() - mLabelVPad,
         title_width,
         title_height);
 
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index 73211d5292..f768839749 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -43,13 +43,17 @@ public:
     :   public LLInitParam::Block<Params, LLView::Params>
     {
         Optional<std::string> label;
+        Optional<S32> label_vpad;
         Optional<LLUIColor> drag_highlight_color;
         Optional<LLUIColor> drag_shadow_color;
+        Optional<const LLFontGL*> font;
 
         Params()
         :   label("label"),
+            label_vpad("label_vpad", 7),
             drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
-            drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark"))
+            drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark")),
+            font("font", LLFontGL::getFontSansSerif())
         {
             changeDefault(mouse_opaque, true);
             changeDefault(follows.flags, FOLLOWS_ALL);
@@ -82,6 +86,8 @@ protected:
 
 protected:
     LLTextBox*      mTitleBox;
+    const LLFontGL* mFont;
+    S32             mLabelVPad;
 
 private:
     LLRect          mButtonsRect;
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index c60253e7fe..9361358ced 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -183,8 +183,10 @@ LLFloater::Params::Params()
     show_title("show_title", true),
     auto_close("auto_close", false),
     positioning("positioning", LLFloaterEnums::POSITIONING_RELATIVE),
+    header_font("header_font", LLFontGL::getFontSansSerif()),
     header_height("header_height", 0),
     legacy_header_height("legacy_header_height", 0),
+    header_vpad("header_vpad", 7),
     close_image("close_image"),
     restore_image("restore_image"),
     minimize_image("minimize_image"),
@@ -293,7 +295,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
     memset(mButtonsEnabled, 0, BUTTON_COUNT * sizeof(bool));
     memset(mButtons, 0, BUTTON_COUNT * sizeof(LLButton*));
 
-    addDragHandle();
+    addDragHandle(p);
     addResizeCtrls();
 
     initFromParams(p);
@@ -336,7 +338,7 @@ void LLFloater::initFloater(const Params& p)
     }
 }
 
-void LLFloater::addDragHandle()
+void LLFloater::addDragHandle(const LLFloater::Params& floater_params)
 {
     if (!mDragHandle)
     {
@@ -346,6 +348,8 @@ void LLFloater::addDragHandle()
             p.name("drag");
             p.follows.flags(FOLLOWS_ALL);
             p.label(mTitle);
+            p.font(floater_params.header_font);
+            p.label_vpad(floater_params.header_vpad);
             mDragHandle = LLUICtrlFactory::create<LLDragHandleLeft>(p);
         }
         else // drag on top
@@ -354,6 +358,8 @@ void LLFloater::addDragHandle()
             p.name("Drag Handle");
             p.follows.flags(FOLLOWS_ALL);
             p.label(mTitle);
+            p.font(floater_params.header_font);
+            p.label_vpad(floater_params.header_vpad);
             mDragHandle = LLUICtrlFactory::create<LLDragHandleTop>(p);
         }
         addChild(mDragHandle);
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 9e1594bdd2..bda2531b43 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -172,8 +172,10 @@ public:
 
         Optional<LLFloaterEnums::EOpenPositioning>  positioning;
 
+        Optional<const LLFontGL*> header_font;
         Optional<S32>           header_height,
-                                legacy_header_height; // HACK see initFromXML()
+                                legacy_header_height, // HACK see initFromXML()
+                                header_vpad;
 
         Optional<F32>           rel_x,
                                 rel_y;
@@ -442,7 +444,7 @@ private:
     bool            offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButton index);
     void            addResizeCtrls();
     void            layoutResizeCtrls();
-    void            addDragHandle();
+    void            addDragHandle(const LLFloater::Params& p);
     void            layoutDragHandle();     // repair layout
 
     static void     updateActiveFloaterTransparency();
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 7544a44478..ce0e8036e7 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -464,6 +464,11 @@ F32 LLFocusMgr::getFocusFlashAmt() const
     return clamp_rescale(mFocusFlashTimer.getElapsedTimeF32(), 0.f, FOCUS_FADE_TIME, 1.f, 0.f);
 }
 
+S32 LLFocusMgr::getFocusFlashWidth() const
+{
+    return ll_round(lerp(1.f, 2.f, getFocusFlashAmt()));
+}
+
 LLColor4 LLFocusMgr::getFocusColor() const
 {
     static LLUIColor focus_color_cached = LLUIColorTable::instance().getColor("FocusColor");
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 89fee5c9f1..2e2293196b 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -101,7 +101,7 @@ public:
     void            setKeystrokesOnly(bool keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
     F32             getFocusFlashAmt() const;
-    S32             getFocusFlashWidth() const { return ll_round(lerp(1.f, 3.f, getFocusFlashAmt())); }
+    S32             getFocusFlashWidth() const;
     LLColor4        getFocusColor() const;
     void            triggerFocusFlash();
     bool            getAppHasFocus() const { return mAppHasFocus; }
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index dafbca7433..fcc1964bd6 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -159,9 +159,11 @@ LLFolderViewItem::Params::Params()
     icon_width("icon_width", 0),
     text_pad("text_pad", 0),
     text_pad_right("text_pad_right", 0),
+    text_pad_top("text_pad_top", 1),
     single_folder_mode("single_folder_mode", false),
     double_click_override("double_click_override", false),
     arrow_size("arrow_size", 0),
+    arrow_pad_top("arrow_pad_top", 1),
     max_folder_item_overlap("max_folder_item_overlap", 0)
 { }
 
@@ -201,7 +203,9 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
     mIconWidth(p.icon_width),
     mTextPad(p.text_pad),
     mTextPadRight(p.text_pad_right),
+    mTextPadTop(p.text_pad_top),
     mArrowSize(p.arrow_size),
+    mArrowPadTop(p.arrow_pad_top),
     mSingleFolderMode(p.single_folder_mode),
     mMaxFolderItemOverlap(p.max_folder_item_overlap),
     mDoubleClickOverride(p.double_click_override)
@@ -811,7 +815,7 @@ void LLFolderViewItem::drawOpenFolderArrow()
     if (hasVisibleChildren() || !isFolderComplete())
     {
         gl_draw_scaled_rotated_image(
-            mIndentation, getRect().getHeight() - mArrowSize - mTextPad - sTopPad,
+            mIndentation, getRect().getHeight() - mArrowSize - mArrowPadTop - sTopPad,
             mArrowSize, mArrowSize, mControlLabelRotation, sFolderArrowImg->getImage(), sFgColor);
     }
 }
@@ -1045,7 +1049,7 @@ void LLFolderViewItem::draw()
 
     S32 filter_string_length = mViewModelItem->hasFilterStringMatch() ? (S32)mViewModelItem->getFilterStringSize() : 0;
     F32 right_x  = 0;
-    F32 y = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad;
+    F32 y = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad;
     F32 text_left = (F32)getLabelXPos();
     LLWString combined_string = mLabel + mLabelSuffix;
 
@@ -1124,7 +1128,7 @@ void LLFolderViewItem::draw()
         if(mLabelSuffix.empty() || (font == sSuffixFont))
         {
             F32 match_string_left = text_left + font->getWidthF32(combined_string.c_str(), 0, filter_offset + filter_string_length) - font->getWidthF32(combined_string.c_str(), filter_offset, filter_string_length);
-            F32 yy = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad;
+            F32 yy = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad;
             font->render(combined_string, filter_offset, match_string_left, yy,
                 sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
                 filter_string_length, S32_MAX, &right_x);
@@ -1135,7 +1139,7 @@ void LLFolderViewItem::draw()
             if(label_filter_length > 0)
             {
                 F32 match_string_left = text_left + font->getWidthF32(mLabel.c_str(), 0, filter_offset + label_filter_length) - font->getWidthF32(mLabel.c_str(), filter_offset, label_filter_length);
-                F32 yy = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad;
+                F32 yy = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad;
                 font->render(mLabel, filter_offset, match_string_left, yy,
                     sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
                     label_filter_length, S32_MAX, &right_x);
@@ -1146,7 +1150,7 @@ void LLFolderViewItem::draw()
             {
                 S32 suffix_offset = llmax(0, filter_offset - (S32)mLabel.size());
                 F32 match_string_left = text_left + font->getWidthF32(mLabel.c_str(), 0, static_cast<S32>(mLabel.size())) + sSuffixFont->getWidthF32(mLabelSuffix.c_str(), 0, suffix_offset + suffix_filter_length) - sSuffixFont->getWidthF32(mLabelSuffix.c_str(), suffix_offset, suffix_filter_length);
-                F32 yy = (F32)rect_height - sSuffixFont->getLineHeight() - (F32)mTextPad - (F32)sTopPad;
+                F32 yy = (F32)rect_height - sSuffixFont->getLineHeight() - (F32)mTextPadTop - (F32)sTopPad;
                 sSuffixFont->render(mLabelSuffix, suffix_offset, match_string_left, yy, sFilterTextColor,
                     LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
                     suffix_filter_length, S32_MAX, &right_x);
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index 23d794bf26..258a806b91 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -73,7 +73,9 @@ public:
                                                     icon_width,
                                                     text_pad,
                                                     text_pad_right,
+                                                    text_pad_top,
                                                     arrow_size,
+                                                    arrow_pad_top,
                                                     max_folder_item_overlap;
         Optional<bool>                              single_folder_mode,
                                                     double_click_override;
@@ -117,7 +119,9 @@ protected:
                                 mIconWidth,
                                 mTextPad,
                                 mTextPadRight,
+                                mTextPadTop,
                                 mArrowSize,
+                                mArrowPadTop,
                                 mMaxFolderItemOverlap;
 
     F32                         mControlLabelRotation;
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index fe0591ce4b..1dc80671cc 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -48,17 +48,21 @@ static LLLayoutStack::LayoutStackRegistry::Register<LLLayoutPanel> register_layo
 LLLayoutPanel::Params::Params()
 :   expanded_min_dim("expanded_min_dim", 0),
     min_dim("min_dim", -1),
+    max_dim("max_dim", -1),
     user_resize("user_resize", false),
     auto_resize("auto_resize", true)
 {
     addSynonym(min_dim, "min_width");
     addSynonym(min_dim, "min_height");
+    addSynonym(max_dim, "max_width");
+    addSynonym(max_dim, "max_height");
 }
 
 LLLayoutPanel::LLLayoutPanel(const Params& p)
 :   LLPanel(p),
     mExpandedMinDim(p.expanded_min_dim.isProvided() ? p.expanded_min_dim : p.min_dim),
     mMinDim(p.min_dim),
+    mMaxDim(p.max_dim),
     mAutoResize(p.auto_resize),
     mUserResize(p.user_resize),
     mCollapsed(false),
@@ -75,6 +79,7 @@ LLLayoutPanel::LLLayoutPanel(const Params& p)
     {
         mVisibleAmt = 0.f;
     }
+    setMaxDim(mMaxDim);
 }
 
 void LLLayoutPanel::initFromParams(const Params& p)
@@ -113,6 +118,8 @@ S32 LLLayoutPanel::getTargetDim() const
 
 void LLLayoutPanel::setTargetDim(S32 value)
 {
+    value = llmin(value, mMaxDim);
+
     LLRect new_rect(getRect());
     if (mOrientation == LLLayoutStack::HORIZONTAL)
     {
@@ -145,6 +152,7 @@ void LLLayoutPanel::setOrientation( LLView::EOrientation orientation )
         setMinDim(layout_dim);
     }
     mTargetDim = llmax(layout_dim, getMinDim());
+    mTargetDim = llmin(mTargetDim, mMaxDim);
 }
 
 void LLLayoutPanel::setVisible( bool visible )
@@ -167,6 +175,7 @@ void LLLayoutPanel::reshape( S32 width, S32 height, bool called_from_parent /*=
     if (!mIgnoreReshape && !mAutoResize)
     {
         mTargetDim = (mOrientation == LLLayoutStack::HORIZONTAL) ? width : height;
+        mTargetDim = llmin(mTargetDim, mMaxDim);
         LLLayoutStack* stackp = dynamic_cast<LLLayoutStack*>(getParent());
         if (stackp)
         {
@@ -439,6 +448,7 @@ void LLLayoutStack::updateLayout()
                 F32 fraction_to_distribute = (panelp->mFractionalSize * panelp->getAutoResizeFactor()) / (total_visible_fraction);
                 S32 delta = ll_round((F32)space_to_distribute * fraction_to_distribute);
                 panelp->mTargetDim += delta;
+                panelp->mTargetDim = llmin(panelp->mTargetDim, panelp->mMaxDim);
                 remaining_space -= delta;
             }
         }
@@ -455,6 +465,7 @@ void LLLayoutStack::updateLayout()
         {
             S32 space_for_panel = remaining_space > 0 ? 1 : -1;
             panelp->mTargetDim += space_for_panel;
+            panelp->mTargetDim = llmin(panelp->mTargetDim, panelp->mMaxDim);
             remaining_space -= space_for_panel;
         }
     }
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 9e3536aaff..4c78c8a289 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -140,7 +140,8 @@ public:
     struct Params : public LLInitParam::Block<Params, LLPanel::Params>
     {
         Optional<S32>           expanded_min_dim,
-                                min_dim;
+                                min_dim,
+                                max_dim;
         Optional<bool>          user_resize,
                                 auto_resize;
 
@@ -164,6 +165,8 @@ public:
     S32 getMinDim() const { return llmax(0, mMinDim); }
     void setMinDim(S32 value) { mMinDim = value; }
 
+    void setMaxDim(S32 value) { mMaxDim = value < 0 ? S32_MAX : value; }
+
     S32 getExpandedMinDim() const { return mExpandedMinDim >= 0 ? mExpandedMinDim : getMinDim(); }
     void setExpandedMinDim(S32 value) { mExpandedMinDim = value; }
 
@@ -198,6 +201,7 @@ protected:
 
     S32     mExpandedMinDim;
     S32     mMinDim;
+    S32     mMaxDim;
     bool    mCollapsed;
     F32     mVisibleAmt;
     F32     mCollapseAmt;
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index ef62666918..9a88083a5d 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -97,6 +97,7 @@ LLLineEditor::Params::Params()
     ignore_tab("ignore_tab", true),
     is_password("is_password", false),
     allow_emoji("allow_emoji", true),
+    draw_focus_border("draw_focus_border", true),
     cursor_color("cursor_color"),
     use_bg_color("use_bg_color", false),
     bg_color("bg_color"),
@@ -147,6 +148,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
     mIgnoreTab( p.ignore_tab ),
     mDrawAsterixes( p.is_password ),
     mAllowEmoji( p.allow_emoji ),
+    mDrawFocusBorder(p.draw_focus_border),
     mSpellCheck( p.spellcheck ),
     mSpellCheckStart(-1),
     mSpellCheckEnd(-1),
@@ -1795,7 +1797,7 @@ void LLLineEditor::drawBackground()
 
         if (!image) return;
         // optionally draw programmatic border
-        if (has_focus)
+        if (has_focus && mDrawFocusBorder)
         {
             LLColor4 tmp_color = gFocusMgr.getFocusColor();
             tmp_color.setAlpha(alpha);
@@ -1955,12 +1957,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/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 6384bfdc5f..fd248edda3 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -95,7 +95,8 @@ public:
                                         show_label_focused,
                                         is_password,
                                         allow_emoji,
-                                        use_bg_color;
+                                        use_bg_color,
+                                        draw_focus_border;
 
         // colors
         Optional<LLUIColor>             cursor_color,
@@ -411,6 +412,7 @@ protected:
 
     bool        mAllowEmoji;
     bool        mUseBgColor;
+    bool        mDrawFocusBorder;
 
     LLWString   mPreeditWString;
     LLWString   mPreeditOverwrittenWString;
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 6ba31c251e..3b21ed8f47 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -73,7 +73,7 @@ S32 MENU_BAR_WIDTH = 410;
 /// Local function declarations, constants, enums, and typedefs
 ///============================================================================
 
-const S32 LABEL_BOTTOM_PAD_PIXELS = 2;
+const S32 LABEL_BOTTOM_PAD_PIXELS = 1;
 
 const U32 LEFT_PAD_PIXELS = 3;
 const U32 LEFT_WIDTH_PIXELS = 15;
@@ -519,21 +519,25 @@ void LLMenuItemGL::draw( void )
     }
     else
     {
+        // Munus are all of the same size, so fixed offset works here,
+        // but it won't work if somebody decides to use different font
+        // todo: adjust logic to work of rect and font height
+        F32 y = (F32)MENU_ITEM_PADDING / 2.f;
         if( !mDrawBoolLabel.empty() )
         {
-            mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+            mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, y, color,
                            LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         }
-        mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+        mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, y, color,
                        LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         if( !mDrawAccelLabel.empty() )
         {
-            mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+            mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, y, color,
                            LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         }
         if( !mDrawBranchLabel.empty() )
         {
-            mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+            mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, y, color,
                            LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         }
     }
@@ -1638,6 +1642,9 @@ void LLMenuItemBranchDownGL::draw( void )
     {
         color = mDisabledColor.get();
     }
+    // Munus are all of the same size, so fixed offset works here,
+    // but it won't work if somebody decides to use different font
+    // todo: adjust logic to work of rect and font height
     getFont()->render( mLabel.getWString(), 0, (F32)getRect().getWidth() / 2.f, (F32)LABEL_BOTTOM_PAD_PIXELS, color,
                    LLFontGL::HCENTER, LLFontGL::BOTTOM, LLFontGL::NORMAL);
 
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 48e42d9fc0..27f1dcb03d 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -483,7 +483,7 @@ void LLTabContainer::draw()
             tuple->mButton->setVisible( true );
         }
 
-        S32 max_scroll_visible = getTabCount() - getMaxScrollPos() + getScrollPos();
+        S32 max_scroll_visible = getVisibleTabCount() - getMaxScrollPos() + getScrollPos();
         S32 idx = 0;
         for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
         {
@@ -1380,6 +1380,20 @@ S32 LLTabContainer::getTabCount() const
     return static_cast<S32>(mTabList.size());
 }
 
+S32 LLTabContainer::getVisibleTabCount() const
+{
+    S32 visible_count = 0;
+    for (tuple_list_t::const_iterator itr = mTabList.begin(); itr != mTabList.end(); ++itr)
+    {
+        const LLTabTuple* pTT = *itr;
+        if (pTT->mVisible)
+        {
+            visible_count++;
+        }
+    }
+    return visible_count;
+}
+
 LLPanel* LLTabContainer::getPanelByIndex(S32 index) const
 {
     if (index >= 0 && index < (S32)mTabList.size())
@@ -2109,6 +2123,14 @@ void LLTabContainer::updateMaxScrollPos()
         S32 tab_space = 0;
         S32 available_space = 0;
         tab_space = mTotalTabWidth;
+        for(tuple_list_t::const_iterator tab_it = mTabList.begin(); tab_it != mTabList.end(); ++tab_it)
+        {
+            const LLTabTuple* tuple = *tab_it;
+            if (!tuple->mVisible)
+            {
+                tab_space -= tuple->mButton->getRect().getWidth();
+            }
+        }
         available_space = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + tabcntr_tab_h_pad);
 
         if( tab_space > available_space )
@@ -2118,7 +2140,7 @@ void LLTabContainer::updateMaxScrollPos()
             available_width_with_arrows -= tabcntr_tab_partial_width;
 
             S32 running_tab_width = 0;
-            setMaxScrollPos(getTabCount());
+            setMaxScrollPos(getVisibleTabCount());
             for(tuple_list_t::reverse_iterator tab_it = mTabList.rbegin(); tab_it != mTabList.rend(); ++tab_it)
             {
                 running_tab_width += (*tab_it)->mButton->getRect().getWidth();
@@ -2129,7 +2151,7 @@ void LLTabContainer::updateMaxScrollPos()
                 setMaxScrollPos(getMaxScrollPos()-1);
             }
             // in case last tab doesn't actually fit on screen, make it the last scrolling position
-            setMaxScrollPos(llmin(getMaxScrollPos(), getTabCount() - 1));
+            setMaxScrollPos(llmin(getMaxScrollPos(), getVisibleTabCount() - 1));
             no_scroll = false;
         }
     }
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index cbf56dc653..3095e641f8 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -188,6 +188,7 @@ public:
     LLPanel*    getCurrentPanel();
     S32         getCurrentPanelIndex() const;
     S32         getTabCount() const;
+    S32         getVisibleTabCount() const;
     LLPanel*    getPanelByIndex(S32 index) const;
     S32         getIndexForPanel(LLPanel* panel) const;
     S32         getPanelIndexByTitle(std::string_view title) const;
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 24ae5c09e9..5882c1edbb 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -51,6 +51,9 @@ const F32   CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32   CURSOR_THICKNESS = 2;
 const F32   TRIPLE_CLICK_INTERVAL = 0.3f;   // delay between double and triple click.
 
+constexpr F32 FOCUSED_SELECTION_BG_ALPHA = 1;
+constexpr F32 UNFOCUSED_SELECTION_BG_ALPHA = 0.7f;
+
 LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S32 line_num)
 :   mDocIndexStart(index_start),
     mDocIndexEnd(index_end),
@@ -529,7 +532,7 @@ void LLTextBase::drawSelectionBackground()
         // Draw the selection box (we're using a box instead of reversing the colors on the selected text).
         gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         const LLColor4& color = mSelectedBGColor;
-        F32 alpha = hasFocus() ? 0.7f : 0.3f;
+        F32 alpha = hasFocus() ? FOCUSED_SELECTION_BG_ALPHA : UNFOCUSED_SELECTION_BG_ALPHA;
         alpha *= getDrawContext().mAlpha;
 
         LLColor4 selection_color(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], alpha);
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 3ab5e905e3..35477bdea9 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -408,6 +408,7 @@ public:
     /*virtual*/ void        setColor(const LLUIColor& c) override;
     virtual     void        setReadOnlyColor(const LLUIColor& c);
     /*virtual*/ void        onVisibilityChange(bool new_visibility) override;
+    void                    setBgReadOnlyColor(const LLUIColor& c) { mReadOnlyBgColor = c; }
 
     /*virtual*/ void        setValue(const LLSD& value) override;
     /*virtual*/ LLTextViewModel* getViewModel() const override;
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index d53fd6eb91..68ca61681c 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -149,7 +149,7 @@ void LLViewBorder::drawOnePixelLines()
         top_color = gFocusMgr.getFocusColor();
         bottom_color = top_color;
 
-        LLUI::setLineWidth(lerp(1.f, 3.f, gFocusMgr.getFocusFlashAmt()));
+        LLUI::setLineWidth(lerp(1.f, 2.f, gFocusMgr.getFocusFlashAmt()));
     }
 
     S32 left    = 0;
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index efa2a79e89..fe88766a43 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12492,17 +12492,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>UIFloaterTitleVPad</key>
-    <map>
-      <key>Comment</key>
-      <string>Distance from top of floater to top of title string, pixels</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <real>7</real>
-    </map>
     <key>UIImgDefaultEyesUUID</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index 97d2345778..ce236dec66 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/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index 9a33bcb1b9..4939cd5fbb 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -175,13 +175,15 @@ void LLNotificationListItem::onMouseEnter(S32 x, S32 y, MASK mask)
 {
     mCondensedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "ScrollHoveredColor" ));
     mExpandedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "ScrollHoveredColor" ));
+    mNoticeTextExp->setBgReadOnlyColor(LLUIColorTable::instance().getColor("SelectedBgReadOnlyColor"));
 }
 
 void LLNotificationListItem::onMouseLeave(S32 x, S32 y, MASK mask)
 {
     mCondensedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
     mExpandedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
-}
+    mNoticeTextExp->setBgReadOnlyColor(LLUIColorTable::instance().getColor("TextBgReadOnlyColor"));
+ }
 
 //static
 LLNotificationListItem* LLNotificationListItem::create(const Params& p)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 0801f2d9f7..e8cb53d263 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1927,7 +1927,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/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 0cfb3ec49a..7457f1c301 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -51,6 +51,7 @@
 #include "llstartup.h"
 #include "lltextbox.h"
 #include "llui.h"
+#include "llframetimer.h"
 #include "lluiconstants.h"
 #include "llslurl.h"
 #include "llversioninfo.h"
@@ -177,6 +178,19 @@ public:
 };
 LLLoginLocationAutoHandler gLoginLocationAutoHandler;
 
+std::string getShortGridLabel(const std::string& slurl_grid)
+{
+    if (slurl_grid == MAINGRID)
+    {
+        return LLTrans::getString("AgniGridLabelShort");
+    }
+    if (slurl_grid == BETAGRID)
+    {
+        return LLTrans::getString("AditiGridLabelShort");
+    }
+    return LLGridManager::getInstance()->getGridLabel(slurl_grid);
+}
+
 //---------------------------------------------------------------------------
 // Public methods
 //---------------------------------------------------------------------------
@@ -187,7 +201,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
     mCallback(callback),
     mCallbackData(cb_data),
     mListener(std::make_unique<LLPanelLoginListener>(this)),
-    mFirstLoginThisInstall(gSavedSettings.getBOOL("FirstLoginThisInstall")),
     mUsernameLength(0),
     mPasswordLength(0),
     mLocationLength(0),
@@ -207,15 +220,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         login_holder->addChild(this);
     }
 
-    if (mFirstLoginThisInstall)
-    {
-        buildFromFile( "panel_login_first.xml");
-    }
-    else
-    {
-        buildFromFile( "panel_login.xml");
-    }
-
+    buildFromFile( "panel_login.xml");
     reshape(rect.getWidth(), rect.getHeight());
 
     LLLineEditor* password_edit(getChild<LLLineEditor>("password_edit"));
@@ -224,17 +229,19 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
     password_edit->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, false));
 
     childSetAction("connect_btn", onClickConnect, this);
+    childSetAction("sign_btn", onClickSignUp, this);
 
     mLoginBtn = getChild<LLButton>("connect_btn");
     setDefaultBtn(mLoginBtn);
 
     // change z sort of clickable text to be behind buttons
     sendChildToBack(getChildView("forgot_password_text"));
-    sendChildToBack(getChildView("sign_up_text"));
+
+    mLoginStack = getChild<LLLayoutStack>("login_stack");
+    mGridPanel = getChild<LLLayoutPanel>("grid_panel");
 
     std::string current_grid = LLGridManager::getInstance()->getGrid();
-    if (!mFirstLoginThisInstall)
-    {
+
         LLComboBox* favorites_combo = getChild<LLComboBox>("start_location_combo");
         updateLocationSelectorsVisibility(); // separate so that it can be called from preferences
         favorites_combo->setReturnCallback(boost::bind(&LLPanelLogin::onClickConnect, false));
@@ -254,17 +261,16 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
             if (!grid_choice->first.empty() && current_grid != grid_choice->first)
             {
                 LL_DEBUGS("AppInit") << "adding " << grid_choice->first << LL_ENDL;
-                server_choice_combo->add(grid_choice->second, grid_choice->first);
+                server_choice_combo->add(getShortGridLabel(grid_choice->first), grid_choice->first);
             }
         }
         server_choice_combo->sortByName();
 
         LL_DEBUGS("AppInit") << "adding current " << current_grid << LL_ENDL;
-        server_choice_combo->add(LLGridManager::getInstance()->getGridLabel(),
+        server_choice_combo->add(getShortGridLabel(current_grid),
             current_grid,
             ADD_TOP);
         server_choice_combo->selectFirstItem();
-    }
 
     LLSLURL start_slurl(LLStartUp::getStartSLURL());
     // The StartSLURL might have been set either by an explicit command-line
@@ -311,12 +317,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
     LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
     forgot_password_text->setClickedCallback(onClickForgotPassword, NULL);
 
-    LLTextBox* sign_up_text = getChild<LLTextBox>("sign_up_text");
-    sign_up_text->setClickedCallback(onClickSignUp, NULL);
-
     // get the web browser control
-    LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("login_html");
-    web_browser->addObserver(this);
+    mWebBrowser = getChild<LLMediaCtrl>("login_html");
+    mWebBrowser->addObserver(this);
 
     loadLoginPage();
 
@@ -337,15 +340,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 void LLPanelLogin::addFavoritesToStartLocation()
 {
-    if (mFirstLoginThisInstall)
-    {
-        // first login panel has no favorites, just update name length and buttons
-        std::string user_defined_name = getChild<LLComboBox>("username_combo")->getSimple();
-        mUsernameLength = static_cast<unsigned int>(user_defined_name.length());
-        updateLoginButtons();
-        return;
-    }
-
     // Clear the combo.
     LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
     if (!combo) return;
@@ -565,16 +559,8 @@ void LLPanelLogin::resetFields()
         // function is used to reset list in case of changes by external sources
         return;
     }
-    if (sInstance->mFirstLoginThisInstall)
-    {
-        // no list to populate
-        LL_WARNS() << "Shouldn't happen, user should have no ability to modify list on first install" << LL_ENDL;
-    }
-    else
-    {
-        LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(LLGridManager::getInstance()->getGrid());
-        sInstance->populateUserList(cred);
-    }
+    LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(LLGridManager::getInstance()->getGrid());
+    sInstance->populateUserList(cred);
 }
 
 // static
@@ -755,6 +741,11 @@ void LLPanelLogin::updateLocationSelectorsVisibility()
         {
             server_combo->setVisible(show_server);
         }
+        if (LLTextBox* grid_txt = sInstance->getChild<LLTextBox>("grid_text"))
+        {
+            grid_txt->setVisible(show_server);
+        }
+        sInstance->collapseGridPanel(!show_server);
     }
 }
 
@@ -790,7 +781,7 @@ void LLPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl)
 
                 // update the grid selector to match the slurl
                 LLComboBox* server_combo = sInstance->getChild<LLComboBox>("server_combo");
-                std::string server_label(LLGridManager::getInstance()->getGridLabel(slurl_grid));
+                std::string server_label(getShortGridLabel(slurl_grid));
                 server_combo->setSimple(server_label);
 
                 updateServer(); // to change the links and splash screen
@@ -863,11 +854,9 @@ void LLPanelLogin::setAlwaysRefresh(bool refresh)
 {
     if (sInstance && LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)
     {
-        LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
-
-        if (web_browser)
+        if (sInstance->mWebBrowser)
         {
-            web_browser->setAlwaysRefresh(refresh);
+            sInstance->mWebBrowser->setAlwaysRefresh(refresh);
         }
     }
 }
@@ -924,16 +913,28 @@ void LLPanelLogin::loadLoginPage()
 
     gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInProductionGrid());
 
-    LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
-    if (web_browser->getCurrentNavUrl() != login_uri.asString())
+    if (sInstance->mWebBrowser->getCurrentNavUrl() != login_uri.asString())
     {
         LL_DEBUGS("AppInit") << "loading:    " << login_uri << LL_ENDL;
-        web_browser->navigateTo( login_uri.asString(), "text/html" );
+        sInstance->mWebBrowser->navigateTo(login_uri.asString(), "text/html");
     }
 }
 
-void LLPanelLogin::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)
+void LLPanelLogin::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
+    constexpr F32 REFRESH_DELAY = 2.f;
+    switch (event)
+    {
+        case MEDIA_EVENT_SIZE_CHANGED:
+        {
+            mForceRefreshTimer.reset();
+            mForceRefreshTimer.setTimerExpirySec(REFRESH_DELAY);
+            mForceRefresh = true;
+            break;
+        }
+        default:
+            break;
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1100,8 +1101,7 @@ void LLPanelLogin::onRememberUserCheck(void*)
         LLComboBox* user_combo(sInstance->getChild<LLComboBox>("username_combo"));
 
         bool remember = remember_name->getValue().asBoolean();
-        if (!sInstance->mFirstLoginThisInstall
-            && user_combo->getCurrentIndex() != -1
+        if (user_combo->getCurrentIndex() != -1
             && !remember)
         {
             remember = true;
@@ -1214,17 +1214,14 @@ void LLPanelLogin::updateLoginButtons()
 {
     mLoginBtn->setEnabled(mUsernameLength != 0 && mPasswordLength != 0 && !mAlertNotif);
 
-    if (!mFirstLoginThisInstall)
+    LLComboBox* user_combo = getChild<LLComboBox>("username_combo");
+    LLCheckBoxCtrl* remember_name = getChild<LLCheckBoxCtrl>("remember_name");
+    if (user_combo->getCurrentIndex() != -1)
     {
-        LLComboBox* user_combo = getChild<LLComboBox>("username_combo");
-        LLCheckBoxCtrl* remember_name = getChild<LLCheckBoxCtrl>("remember_name");
-        if (user_combo->getCurrentIndex() != -1)
-        {
-            remember_name->setValue(true);
-            LLCheckBoxCtrl* remember_pass = getChild<LLCheckBoxCtrl>("remember_password");
-            remember_pass->setEnabled(true);
-        } // Note: might be good idea to do "else remember_name->setValue(mRememberedState)" but it might behave 'weird' to user
-    }
+        remember_name->setValue(true);
+        LLCheckBoxCtrl* remember_pass = getChild<LLCheckBoxCtrl>("remember_password");
+        remember_pass->setEnabled(true);
+    } // Note: might be good idea to do "else remember_name->setValue(mRememberedState)" but it might behave 'weird' to user
 }
 
 void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
@@ -1403,3 +1400,29 @@ bool LLPanelLogin::onUpdateNotification(const LLSD& notify)
     }
     return false;
 }
+
+void LLPanelLogin::collapseGridPanel(bool collapse)
+{
+    if (mGridPanel->isCollapsed() == collapse)
+    {
+        return;
+    }
+    mLoginStack->collapsePanel(mGridPanel, collapse);
+    mLoginStack->updateLayout();
+}
+
+void LLPanelLogin::draw()
+{
+    LLPanel::draw();
+
+    // Workaround for the black screen issue (see #5607)
+    // Should be removed after the proper fix for resizing is implemented
+    if (mForceRefresh && mForceRefreshTimer.hasExpired())
+    {
+        if (mWebBrowser->getMediaPlugin())
+        {
+            mWebBrowser->getMediaPlugin()->forceRenderRefresh();
+        }
+        mForceRefresh = false;
+    }
+}
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index f527aa53ac..a00081795e 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -48,6 +48,8 @@ public:
                 void *callback_data);
     ~LLPanelLogin();
 
+    void draw();
+
     virtual void setFocus( bool b );
 
     static void show(const LLRect &rect,
@@ -87,6 +89,8 @@ public:
     // extract name from cred in a format apropriate for username field
     static std::string getUserName(LLPointer<LLCredential> &cred);
 
+    void collapseGridPanel(bool collapse);
+
 private:
     friend class LLPanelLoginListener;
     void addFavoritesToStartLocation();
@@ -122,7 +126,6 @@ private:
 
     static LLPanelLogin* sInstance;
     static bool     sCapslockDidNotification;
-    bool            mFirstLoginThisInstall;
 
     static bool sCredentialSet;
 
@@ -130,8 +133,15 @@ private:
     unsigned int mPasswordLength;
     unsigned int mLocationLength;
 
+    LLTimer mForceRefreshTimer;
+    bool mForceRefresh {false};
+
     bool mAlertNotif;
     LLButton* mLoginBtn;
+    LLLayoutPanel* mGridPanel;
+    LLLayoutStack* mLoginStack;
+
+    LLMediaCtrl* mWebBrowser;
 };
 
 #endif
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 55500eea9a..8dab1e42d0 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -654,7 +654,7 @@ void init_menus()
     LLRect menuBarRect = gLoginMenuBarView->getRect();
     menuBarRect.setLeftTopAndSize(0, menu_bar_holder->getRect().getHeight(), menuBarRect.getWidth(), menuBarRect.getHeight());
     gLoginMenuBarView->setRect(menuBarRect);
-    gLoginMenuBarView->setBackgroundColor( color );
+    gLoginMenuBarView->setBackgroundColor(LLColor4::black);
     menu_bar_holder->addChild(gLoginMenuBarView);
 
     // tooltips are on top of EVERYTHING, including menus
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 6cb3aee20c..8ec2a6d661 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -63,7 +63,7 @@ const std::string  GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types";
 const std::string GRID_SLURL_BASE = "slurl_base";
 const std::string GRID_APP_SLURL_BASE = "app_slurl_base";
 
-const std::string DEFAULT_LOGIN_PAGE = "https://viewer-splash.secondlife.com/";
+const std::string DEFAULT_LOGIN_PAGE = "https://viewer-splash-v2.secondlife.com/";
 
 const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
 
@@ -125,7 +125,7 @@ void LLGridManager::initialize(const std::string& grid_file)
                   MAIN_GRID_WEB_PROFILE_URL,
                   "Agni");
     addSystemGrid(LLTrans::getString("AditiGridLabel"),
-                  "util.aditi.lindenlab.com",
+                  BETAGRID,
                   "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
                   "https://secondlife.aditi.lindenlab.com/helpers/",
                   DEFAULT_LOGIN_PAGE,
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 2ed663e038..0937425a18 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -30,6 +30,7 @@
 
 // @TODO this really should be private, but is used in llslurl
 #define MAINGRID "util.agni.lindenlab.com"
+#define BETAGRID "util.aditi.lindenlab.com"
 
 /// Exception thrown when a grid is not valid
 class LLInvalidGridName
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 699b727212..b15938a2f1 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -4,13 +4,16 @@
 	<!-- Named Colors -->
 	<color
 	 name="EmphasisColor"
-	 value="0.25 0.48 0.70 1" />
-	<color
-	 name="EmphasisColor_13"
-	 value="0.25 0.48 0.70 0.13" />
+	 value="0.3 0.82 1 1" />
 	<color
 	 name="EmphasisColor_35"
-	 value="0.25 0.48 0.70 0.35" />
+	 value="0.426 0.729 1.0 0.368" />
+    <color
+     name="SelectionColor"
+     value="0.706 0.851 1 1" />
+    <color
+     name="ScrollHoveredColor"
+     value="0.18 0.26 0.33 1" />
 	<color
 	 name="BeaconColor"
     value="0.749 0.298 0 1" />	 
@@ -53,6 +56,9 @@
 	<color
 	 name="DkGray2"
 	 value="0.169 0.169 0.169 1" />
+    <color
+	 name="DkGrayLogin"
+	 value="0.129 0.133 0.137 1" />
 	<color
 	 name="MouseGray"
 	 value="0.191 0.191 0.191 1" />
@@ -339,7 +345,7 @@
      reference="EmphasisColor" />
     <color
      name="ConversationFriendColor"
-     value="0.5 0.7 0.85 1" />
+     reference="EmphasisColor" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
@@ -378,7 +384,7 @@
      reference="Black_50" />
     <color
      name="FocusColor"
-     reference="EmphasisColor" />
+     value="0.7 0.7 0.7 1" />
     <color
      name="FolderViewLoadingMessageTextColor"
      value="0.3344 0.545 0.645 1" />
@@ -599,7 +605,7 @@
      reference="White" />
     <color
      name="NameTagFriend"
-     value="0.5 0.7 0.85 1" />
+     reference="EmphasisColor" />
     <color
      name="NameTagLegacy"
      reference="White" />
@@ -745,9 +751,6 @@
      name="ScrollHighlightedColor"
      reference="Unused?" />
     <color
-     name="ScrollHoveredColor"
-     reference="EmphasisColor_13" />
-    <color
      name="ScrollSelectedBGColor"
      reference="EmphasisColor_35" />
     <color
@@ -766,6 +769,9 @@
      name="SelectedOutfitTextColor"
      reference="EmphasisColor" />
     <color
+     name="WornOutfitTextColor"
+     value="0.54 0.73 0.87 1" />
+    <color
      name="SearchableControlHighlightFontColor"
      value="1 0 0 1" />
     <color
@@ -796,6 +802,9 @@
      name="SystemChatColor"
      reference="LtGray" />
     <color
+     name="SelectedBgReadOnlyColor"
+     value="0.15 0.21 0.27 1" />
+    <color
      name="TextBgFocusColor"
      reference="White" />
     <color
@@ -867,18 +876,24 @@
     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
@@ -988,7 +1003,7 @@
     value="1 0.14 0 1" />
   <color
     name="OutfitGalleryItemSelected"
-    reference="EmphasisColor_35" />
+    value="0.26 0.36 0.47 1"/>
   <color
     name="OutfitGalleryItemWorn"
     reference="EmphasisColor_13" />
@@ -999,6 +1014,9 @@
     name="PanelGray"
     value="0.27 0.27 0.27 1" />
   <color
+    name="PanelDark"
+    value="0.078 0.078 0.078 1" />
+  <color
     name="PerformanceMid"
     value="1 0.8 0 1" />
   <color
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 5f25281518..2e84daaf6b 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
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 1df7618a2b..1854cb87df 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
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 82e6806af6..d009044ee1 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
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 338062c083..a9415e9cc0 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
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 a2ac8bd8c6..f22f6e23b6 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
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 0cb73798b3..238d005bef 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
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 83df78e8f3..ad4a02ee27 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
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 be7366a2a8..1a134661eb 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
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 32bdb8a034..8c5bf3bc66 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
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 168af4bac5..1eeab859e5 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
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 803ce250e7..57762defe4 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
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 3b7f83fbab..512bd3b64e 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
index 438b4912f8..b1012e505e 100644
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
index 693adc4781..49cdadded7 100644
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
index 818b34d40f..9afe58dcd1 100644
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
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 0f04cb2f28..051c85d05d 100644
--- a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
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 2a10237771..3560b36ec6 100644
--- a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
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 ee6db5d64e..8f752aaf4c 100644
--- a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
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 37f35f9339..90844abe94 100644
--- a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
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 ad6ba66bed..66e1c45567 100644
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
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 03a47494f5..48ae5969a1 100644
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
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 daefae7389..eff8a231d6 100644
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
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 73470c7af9..ab7921b97d 100644
--- a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
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 361c915231..446951d992 100644
--- a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
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 49b76d137e..a23e6dba50 100644
--- a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
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 473b90e867..daf39a658c 100644
--- a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
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 20278c8f6d..28175f107e 100644
--- a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
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 e6cad859fd..049ca64f05 100644
--- a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
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 52b4f535f8..8b45d668aa 100644
--- a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
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 4469814e1a..c94a984c41 100644
--- a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png
index 2222954332..ab852007ab 100644
--- a/indra/newview/skins/default/textures/containers/Accordion_Selected.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_Selected.png
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 0000000000..d6c6bc41ec
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png
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 0000000000..cc310bbc26
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png
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 0000000000..177d341ba3
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png
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 0000000000..54bd4d923d
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png
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 0000000000..28a315665b
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png
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 0000000000..993e79b37f
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png
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 0000000000..1f5d926cc8
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png
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 0000000000..e4e4d27d42
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png
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 8b40051c0b..62f82879cf 100644
--- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png
index 6399cd6715..1d00c2c175 100644
--- a/indra/newview/skins/default/textures/icons/Info_Over.png
+++ b/indra/newview/skins/default/textures/icons/Info_Over.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
index 2550cae0d4..19afa94cc4 100644
--- a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
index 5b56d86184..7ca0f5a849 100644
--- a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png
index 5e376c72f9..7b147df369 100644
--- a/indra/newview/skins/default/textures/icons/SL_Logo.png
+++ b/indra/newview/skins/default/textures/icons/SL_Logo.png
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 c9c7bf5fec..0c96257470 100644
--- a/indra/newview/skins/default/textures/icons/back_arrow_off.png
+++ b/indra/newview/skins/default/textures/icons/back_arrow_off.png
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 ee6acc2653..a7fac5ef99 100644
--- a/indra/newview/skins/default/textures/icons/back_arrow_over.png
+++ b/indra/newview/skins/default/textures/icons/back_arrow_over.png
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 9876b4eeb7..0c96257470 100644
--- a/indra/newview/skins/default/textures/icons/back_arrow_press.png
+++ b/indra/newview/skins/default/textures/icons/back_arrow_press.png
diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png
index 95ca9dbd6c..00ec32964d 100644
--- a/indra/newview/skins/default/textures/icons/check_mark.png
+++ b/indra/newview/skins/default/textures/icons/check_mark.png
diff --git a/indra/newview/skins/default/textures/icons/hand.png b/indra/newview/skins/default/textures/icons/hand.png
index 5fbdb70c2b..6effb7c77d 100644
--- a/indra/newview/skins/default/textures/icons/hand.png
+++ b/indra/newview/skins/default/textures/icons/hand.png
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 adc37f5528..51d369003c 100644
--- a/indra/newview/skins/default/textures/icons/see_me_online.png
+++ b/indra/newview/skins/default/textures/icons/see_me_online.png
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 0000000000..b952f2cfb0
--- /dev/null
+++ b/indra/newview/skins/default/textures/locked_image_dark.png
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 fce54942d3..cbb78cd514 100644
--- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
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 8cc3f02c5a..6b4092bf49 100644
--- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png
index cfc31f8d32..0eeb4f494c 100644
--- a/indra/newview/skins/default/textures/navbar/Row_Selection.png
+++ b/indra/newview/skins/default/textures/navbar/Row_Selection.png
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 0000000000..9f344c4842
--- /dev/null
+++ b/indra/newview/skins/default/textures/square_selection.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a8fc8faa44..908fa63383 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -124,7 +124,9 @@ with the same filename but different name
   <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" />
   <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" />
   <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" />
+  <texture name="Checkbox_Slim_Off" file_name="widgets/Checkbox_Slim_Off.png" preload="true" />
   <texture name="Checkbox_On" file_name="widgets/Checkbox_On.png" preload="true" />
+  <texture name="Checkbox_Slim_On" file_name="widgets/Checkbox_Slim_On.png" preload="true" />
   <texture name="Checkbox_On_Press" file_name="widgets/Checkbox_On_Press.png" preload="true" />
   <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" />
   <texture name="Check_Mark" file_name="icons/check_mark.png" preload="true" />
@@ -174,6 +176,8 @@ with the same filename but different name
   <texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Arrow" file_name="widgets/ComboButton_Arrow.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Transparent" file_name="widgets/ComboButton_Transparent.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="Container" file_name="containers/Container.png" preload="false" />
 
@@ -561,15 +565,16 @@ with the same filename but different name
   <texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Over" file_name="widgets/PushButton_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <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" file_name="widgets/PushButton_Press.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="PushButton_Login" file_name="widgets/PushButton_Login.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Login_Over" file_name="widgets/PushButton_Login_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Login_Pressed" file_name="widgets/PushButton_Login_Pressed.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-
+  <texture name="PushButton_Sign" file_name="widgets/PushButton_Sign.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Sign_Over" file_name="widgets/PushButton_Sign_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Sign_Pressed" file_name="widgets/PushButton_Sign_Pressed.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" />
@@ -650,6 +655,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" />
@@ -658,6 +665,7 @@ with the same filename but different name
   <texture name="startup_logo"  file_name="windows/startup_logo.png" preload="true" />
 
   <texture name="login_mp_logo"  file_name="windows/login_mp_logo.png" preload="true" />
+  <texture name="login_sl_logo_horizontal"  file_name="windows/login_sl_logo_horizontal.png" preload="true" />
   <texture name="login_mp_logo_small"  file_name="windows/login_mp_logo_small.png" preload="true" />
   <texture name="first_login_image"  file_name="windows/first_login_image.jpg" preload="true" />
 
@@ -687,6 +695,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" />
@@ -704,7 +721,9 @@ 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="TextField_Transparent" file_name="widgets/TextField_Transparent.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
 
@@ -872,6 +891,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 8439f82e29..383ff8f6e3 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
index cb9a04d84f..66f12496cb 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
index 0ec090504a..549bbde5cd 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
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 5759f7de69..9c80670837 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
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 ba46e91c55..903c61f01b 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
index 5f5a33d878..96dfd7267c 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Slim_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Slim_Off.png
new file mode 100644
index 0000000000..99af0397d5
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Slim_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Slim_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_Slim_On.png
new file mode 100644
index 0000000000..cabecf1467
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Slim_On.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Arrow.png b/indra/newview/skins/default/textures/widgets/ComboButton_Arrow.png
new file mode 100644
index 0000000000..7961967458
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Arrow.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
index ebeb813349..5b2bc7b163 100644
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
index 8c315a9d25..7199470307 100644
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
index 15afcb04a1..715b401ce5 100644
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Transparent.png b/indra/newview/skins/default/textures/widgets/ComboButton_Transparent.png
new file mode 100644
index 0000000000..4b978877e1
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Transparent.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
index 34edea9421..9e74524be4 100644
--- a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
index 9583f05507..aa8865c33d 100644
--- a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
index 9a69f7e0d9..fff0cfaff2 100644
--- a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
index b118e7a7d4..9f6a2313b9 100644
--- a/indra/newview/skins/default/textures/widgets/DropDown_Off.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png
index 3613e42a3f..a498465940 100644
--- a/indra/newview/skins/default/textures/widgets/DropDown_On.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_On.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
index ec0ffc2e88..b6bf4d1c22 100644
--- a/indra/newview/skins/default/textures/widgets/DropDown_Press.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png
index 8c80522232..9316567e7b 100644
--- a/indra/newview/skins/default/textures/widgets/ListItem_Over.png
+++ b/indra/newview/skins/default/textures/widgets/ListItem_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png
index b27e0ee787..cd65d347d6 100644
--- a/indra/newview/skins/default/textures/widgets/ListItem_Select.png
+++ b/indra/newview/skins/default/textures/widgets/ListItem_Select.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index de71f763d3..b2767c6174 100644
--- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index 6020fadc5a..de50b29f79 100644
--- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
index e99ec4b14b..64a9a2d885 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login.png b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
index 8e7d932ab1..7e892d2b0a 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
index 038ba23be2..9110889d6c 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png
index 828aa1a139..bf38c2cd75 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
index c74cea62d3..113c371a4d 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Off.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png
index e387c7e313..db70f75dd6 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_On.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
index 34a64a3ade..67dfa0ca75 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Over.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
index 79fc601f27..8dfa9030b1 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Press.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
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 e2818da352..062fcf9246 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Sign.png b/indra/newview/skins/default/textures/widgets/PushButton_Sign.png
new file mode 100644
index 0000000000..f1c27f8c9b
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Sign.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Sign_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Sign_Over.png
new file mode 100644
index 0000000000..efef8bebad
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Sign_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Sign_Pressed.png b/indra/newview/skins/default/textures/widgets/PushButton_Sign_Pressed.png
new file mode 100644
index 0000000000..ec3409e8b8
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Sign_Pressed.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
index 32ec25fe0e..fb98907be2 100644
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
index 5d267af5dc..231aead651 100644
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
index e6bf0db157..066872ff82 100644
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
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 72aae43618..43af5bec2f 100644
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
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 f3883b82b3..6870a48129 100644
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
index 0025256045..0fb0054bfb 100644
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
index 9afc907c1c..eb9563e0ee 100644
--- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
index ede643e528..144a7cba25 100644
--- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
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 65d082b993..8ad008ba51 100644
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
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 12f55c599e..ca5f84a088 100644
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
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 6a023156c5..9b1531a11e 100644
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
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 457644e69a..28f5bf37f7 100644
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
index 5cfa3ae4e1..fb98907be2 100644
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
index 66cdcbeb94..231aead651 100644
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
index 0bf8e43e81..0fb0054bfb 100644
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
index 720830f83f..65cfaf4c62 100644
--- a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
+++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
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 ff21034095..720946aba6 100644
--- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
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 e888e1e045..505fa6c82c 100644
--- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
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 133845bdbc..9482e4773e 100644
--- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
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 dffd557bbd..ca311768c4 100644
--- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
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 0000000000..71c2a5dbc3
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Highlight.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Transparent.png b/indra/newview/skins/default/textures/widgets/TextField_Transparent.png
new file mode 100644
index 0000000000..1735184387
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Transparent.png
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 03d1e805e1..1e2ce7bc83 100644
--- a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
+++ b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
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 cdc52fe08a..25f2914ecc 100644
--- a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
+++ b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
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 b6592b5992..adfb51edd2 100644
--- a/indra/newview/skins/default/textures/widgets/track_control_sphere.png
+++ b/indra/newview/skins/default/textures/widgets/track_control_sphere.png
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 b3191ccc5d..98bae90332 100644
--- a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png
+++ b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png
index 0d1719c66f..d51cf43051 100644
--- a/indra/newview/skins/default/textures/windows/Inspector_I.png
+++ b/indra/newview/skins/default/textures/windows/Inspector_I.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
index f19fb0300b..83a09584c1 100644
--- a/indra/newview/skins/default/textures/windows/Window_Background.png
+++ b/indra/newview/skins/default/textures/windows/Window_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
index 15d2ff72b6..1f4f9040bc 100644
--- a/indra/newview/skins/default/textures/windows/Window_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/login_sl_logo_horizontal.png b/indra/newview/skins/default/textures/windows/login_sl_logo_horizontal.png
new file mode 100644
index 0000000000..f56d0bd542
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/login_sl_logo_horizontal.png
diff --git a/indra/newview/skins/default/xui/de/panel_login_first.xml b/indra/newview/skins/default/xui/de/panel_login_first.xml
deleted file mode 100644
index 038001157e..0000000000
--- a/indra/newview/skins/default/xui/de/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=de
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Benutzername" name="username_combo" tool_tip="Bei der Registrierung gewählter Benutzername wie „berndschmidt12“ oder „Liebe Sonne“"/>
-					<line_editor label="Kennwort" name="password_edit"/>
-					<button label="Anmelden" name="connect_btn"/>
-					<check_box label="Details speichern" name="remember_check"/>
-					<text name="forgot_password_text">
-						Kennwort vergessen
-					</text>
-					<text name="sign_up_text">
-						Registrieren
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Ihr erster Schritt ist Learning Island. Suchen Sie die Pforte!
-					</text>
-					<text name="image_caption_right">
-						Erkunden Sie dann Social Island und lernen Sie andere Einwohner kennen!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index c5b42b6dae..347b523a6b 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -974,7 +974,7 @@
              layout="topleft"
              left="28"
              name="Set to group:"
-             top_pad="5"
+             top_pad="9"
              width="176">
                 Set to group:
             </text>
@@ -1022,7 +1022,7 @@
              layout="topleft"
              left="28"
              name="Owned by others:"
-             top_pad="5"
+             top_pad="9"
              width="176">
                 Owned by others:
             </text>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index adbce0d982..0c82cbb00c 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -63,7 +63,7 @@
              layout="topleft"
              left="10"
              name="InstructSearchResidentName"
-             top="8"
+             top="7"
              width="220">
                 Type part of a person&apos;s name:
             </text>
@@ -76,7 +76,7 @@
              height="23"
              left_delta="0"
              name="Edit"
-             top_pad="0"
+             top_pad="3"
              width="65" />
             <button
              follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 7636284b4b..17631ad30c 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -29,7 +29,7 @@
      control_name="BulkChangeIncludeAnimations"
      height="16"
      name="check_animation"
-     top="24"
+     top="30"
      left="10"
      width="16" />
     <icon
@@ -73,7 +73,7 @@
      name="check_gesture"
      left="95"
      width="16"
-     top="25" />
+     top="30" />
     <icon
      height="16"
      image_name="Inv_Gesture"
@@ -116,7 +116,7 @@
      control_name="BulkChangeIncludeScripts"
      height="16"
      name="check_script"
-     top="25"
+     top="30"
      left="180"
      width="16"
      />
@@ -161,7 +161,7 @@
     height="16"
     name="check_settings"
     left="245"
-    top="25"
+    top="30"
     width="16" />
   <icon
     height="16"
@@ -291,7 +291,7 @@
      height="16"
      label="Copy"
      layout="topleft"
-     top_pad="0"
+     top_pad="3"
      name="next_owner_copy"
      tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
      width="92">
@@ -302,7 +302,7 @@
      control_name="BulkChangeNextOwnerTransfer"
      enabled_control="BulkChangeNextOwnerCopy"
      height="16"
-     top_pad="0"
+     top_pad="3"
      initial_value="true"
      label="Transfer"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
index c831684594..41e8d3dc8a 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
@@ -5,7 +5,7 @@
  can_minimize="true"
  can_close="true"
  can_resize="false"
- height="80"
+ height="84"
  width="515"
  layout="topleft"
  name="HoverHeight"
@@ -39,6 +39,6 @@
      label="Bind Camera view"
      layout="topleft"
      name="BindCameraCheck"
-     top_pad="7"
+     top_pad="14"
      width="237"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
index 61cb91e2f3..8070ed55e6 100644
--- a/indra/newview/skins/default/xui/en/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/en/floater_font_test.xml
@@ -5,7 +5,7 @@
  height="800"
  layout="topleft"
  min_height="175"
- min_width="154"
+ min_width="390"
  name="contents"
  help_topic="contents"
  title="FONT TEST"
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index f8ec696af9..7097689118 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -6,7 +6,7 @@
  name="godtools floater"
  help_topic="godtools_floater"
  title="GOD TOOLS"
- width="400">
+ width="410">
     <tab_container
      follows="left|top"
      height="364"
@@ -15,7 +15,7 @@
      name="GodTools Tabs"
      tab_position="top"
      top="20"
-     width="400">
+     width="410">
         <panel
          border="true"
          follows="left|top|right|bottom"
@@ -72,11 +72,11 @@
              follows="left|top|right"
              height="20"
              layout="topleft"
-             left_pad="0"
+             left_pad="5"
              max_length_bytes="63"
              name="region name"
              top_delta="0"
-             width="250">
+             width="294">
 			       <line_editor.commit_callback
 					function="RegionTools.ChangeAnything" />
 			</line_editor>
@@ -233,13 +233,13 @@
              border_style="line"
              border_thickness="1"
              follows="top|right"
-             height="16"
+             height="18"
              layout="topleft"
-             left_delta="108"
+             left_delta="90"
              max_length_bytes="10"
              name="estate"
              top_delta="0"
-             width="50" />
+             width="100" />
             <text
              type="string"
              length="1"
@@ -249,7 +249,7 @@
              layout="topleft"
              left="200"
              name="parent id"
-             top_pad="4"
+             top_pad="7"
              width="190">
                 Parent ID:
             </text>
@@ -257,14 +257,14 @@
              border_style="line"
              border_thickness="1"
              follows="top|right"
-             height="16"
+             height="18"
              layout="topleft"
-             left_delta="108"
+             left_delta="90"
              max_length_bytes="10"
              name="parentestate"
              tool_tip="This is the parent estate for this region"
              top_delta="0"
-             width="50">
+             width="100">
 			       <line_editor.commit_callback
 					function="RegionTools.ChangeAnything" />
 			</line_editor>
@@ -276,22 +276,22 @@
              layout="topleft"
              left="200"
              name="Grid Pos: "
-             top_pad="4"
-             width="190">
+             top_pad="7"
+             width="90">
                 Grid Pos:
             </text>
             <line_editor
              border_style="line"
              border_thickness="1"
              follows="top|right"
-             height="16"
+             height="18"
              layout="topleft"
-             left_delta="88"
+             left_pad="0"
              max_length_bytes="10"
              name="gridposx"
              tool_tip="This is the grid x position for this region"
              top_delta="0"
-             width="50">
+             width="46">
 			       <line_editor.commit_callback
 					function="RegionTools.ChangeAnything" />
 			</line_editor>
@@ -299,14 +299,14 @@
              border_style="line"
              border_thickness="1"
              follows="top|right"
-             height="16"
+             height="18"
              layout="topleft"
-             left_pad="10"
+             left_pad="8"
              max_length_bytes="10"
              name="gridposy"
              tool_tip="This is the grid y position for this region"
              top_delta="0"
-             width="40">
+             width="46">
 			       <line_editor.commit_callback
 					function="RegionTools.ChangeAnything" />
 			</line_editor>
@@ -318,20 +318,20 @@
              layout="topleft"
              left="200"
              name="Redirect to Grid: "
-             top_pad="4"
-             width="88">
+             top_pad="7"
+             width="90">
                 Redirect to Grid:
             </text>
             <line_editor
              border_style="line"
              border_thickness="1"
              follows="top|right"
-             height="16"
+             height="18"
              layout="topleft"
              left_pad="0"
              max_length_bytes="10"
              name="redirectx"
-             width="50">
+             width="46">
 			       <line_editor.commit_callback
 					function="RegionTools.ChangeAnything" />
 			</line_editor>
@@ -339,13 +339,13 @@
              border_style="line"
              border_thickness="1"
              follows="top|right"
-             height="16"
+             height="18"
              layout="topleft"
-             left_pad="10"
+             left_pad="8"
              max_length_bytes="10"
              name="redirecty"
              top_delta="0"
-             width="40">
+             width="46">
 			       <line_editor.commit_callback
 					function="RegionTools.ChangeAnything" />
 			</line_editor>
@@ -407,10 +407,10 @@
              label="Refresh"
              label_selected="Refresh"
              layout="topleft"
-             left="278"
+             left="280"
              name="Refresh"
              tool_tip="Click here to refresh the above information"
-             top_pad="10"
+             top_pad="14"
              width="110">
 				<button.commit_callback
 				function="RegionTools.Refresh" />
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index a51e7a844a..9d2ed43756 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -145,7 +145,7 @@
    font="SansSerifMedium"
    text_color="White"
    top_delta="1"
-   width="300">
+   width="310">
    Clicking on "Show in inventory" or "Find original"
  </text>
  <radio_group
diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
index fbd3c81bad..67831c2449 100644
--- a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -4,9 +4,9 @@
  can_resize="true"
  default_tab_group="1"
  height="790"
- width="256"
+ width="267"
  min_height="500"
- min_width="256"
+ min_width="267"
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
@@ -17,7 +17,7 @@
    top="18"
    left="4"
    height="768"
-   width="250"
+   width="261"
    follows="all"
    layout="topleft"
    color="Transparent"
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 21ceeafeea..f894e94622 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -4,9 +4,9 @@
  can_resize="true"
  default_tab_group="1"
  height="891"
- width="256"
+ width="267"
  min_height="500"
- min_width="256"
+ min_width="267"
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
@@ -20,7 +20,7 @@
    top="18"
    left="4"
    height="768"
-   width="250"
+   width="261"
    follows="all"
    layout="topleft"
    color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 39e9de0980..a023f2064f 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1879,7 +1879,7 @@ Analysed:
       top="5"
       left_pad="20"
       name="label_display"
-      width="50">
+      width="53">
       Display...
     </text>
     <check_box
@@ -1889,7 +1889,7 @@ Analysed:
       layout="topleft"
       left_delta="0"
       name="show_edges"
-      top_pad="8">
+      top_pad="10">
     </check_box>
     <check_box
       follows="top|left"
@@ -1897,7 +1897,7 @@ Analysed:
       label_text.text_color="White"
       layout="topleft"
       name="show_physics"
-      top_pad="8">
+      top_pad="10">
     </check_box>
     <check_box
       follows="top|left"
@@ -1905,7 +1905,7 @@ Analysed:
       label_text.text_color="White"
       layout="topleft"
       name="show_textures"
-      top_pad="8">
+      top_pad="10">
     </check_box>
     <check_box
       follows="top|left"
@@ -1913,7 +1913,7 @@ Analysed:
       label_text.text_color="White"
       layout="topleft"
       name="show_skin_weight"
-      top_pad="8">
+      top_pad="10">
     </check_box>
     <check_box
       follows="top|left"
@@ -1923,7 +1923,7 @@ Analysed:
       width="130"
       layout="topleft"
       name="show_joint_overrides"
-      top_pad="8">
+      top_pad="10">
     </check_box>
     <check_box
       follows="top|left"
@@ -1931,7 +1931,7 @@ Analysed:
       label_text.text_color="White"
       layout="topleft"
       name="show_joint_positions"
-      top_pad="17">
+      top_pad="21">
     </check_box>
     <text
       follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index dd0795305e..10e74e9a31 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -41,6 +41,7 @@
                     mouse_opaque="true"
                     name="icon_settingsdays"
                     left="4"
+                    top="9"
                     width="16" />
             <check_box
                     height="16"
@@ -48,7 +49,7 @@
                     layout="topleft"
                     left_pad="2"
                     name="chk_days"
-                    top_delta="0"
+                    top_delta="2"
                     width="60" />
             <icon
                     height="16"
@@ -57,6 +58,7 @@
                     mouse_opaque="true"
                     name="icon_settingsskies"
                     left_pad="10"
+                    top="9"
                     width="16" />
             <check_box
                     height="16"
@@ -64,7 +66,7 @@
                     layout="topleft"
                     left_pad="2"
                     name="chk_skies"
-                    top_delta="0"
+                    top_delta="2"
                     width="60" />
             <icon
                     height="16"
@@ -73,6 +75,7 @@
                     mouse_opaque="true"
                     name="icon_settingswater"
                     left_pad="10"
+                    top="9"
                     width="16" />
             <check_box
                     height="16"
@@ -80,7 +83,7 @@
                     layout="topleft"
                     left_pad="2"
                     name="chk_water"
-                    top_delta="0"
+                    top_delta="2"
                     width="60" />
           <filter_editor
                   follows="left|top|right"
@@ -89,7 +92,7 @@
                   layout="topleft"
                   left="4"
                   name="flt_search"
-                  top_pad="6"
+                  top_pad="4"
                   right="-4" />
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index 881c1f7469..def57abfe4 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -12,7 +12,7 @@
  save_visibility="true"
  reuse_instance="true"
  title="INVENTORY"
- width="418" >
+ width="424" >
    <panel
     class="sidepanel_inventory"
     name="main_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 9981e5d893..66c229e698 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
- height="130"
+ height="140"
  width="300"
  layout="topleft"
  name="floater_new_feature_notification"
@@ -40,7 +40,7 @@ New feature
    text_color="White"
    layout="topleft"
    left="10"
-   height="40"
+   height="50"
    top_pad="14"
    right="-10"
    word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 97ff1fd5a2..af3403d034 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/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index 9d4fb82ec6..7108005f00 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -2,7 +2,7 @@
 <!-- Explicit left edge to avoid overlapping build tools -->
 <floater
  legacy_header_height="18"
- height="250"
+ height="260"
  layout="topleft"
  name="telehub"
  help_topic="telehub"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index dba323a9e1..e4dab5b7ac 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -84,11 +84,14 @@
      left="10"
      name="button focus"
      tool_tip="Focus"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Focus" />
-	</button>
+     width="35"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
+        <button.commit_callback
+         function="BuildTool.setTool"
+         parameter="Focus" />
+    </button>
     <button
      follows="left|top"
       height="25"
@@ -99,7 +102,10 @@
      left_pad="10"
      name="button move"
      tool_tip="Move"
-     width="35">
+     width="35"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Move" />
@@ -114,7 +120,10 @@
      left_pad="10"
      name="button edit"
      tool_tip="Edit"
-     width="35">
+     width="35"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Edit" />
@@ -129,7 +138,10 @@
      left_pad="10"
      name="button create"
      tool_tip="Create"
-     width="35">
+     width="35"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Create" />
@@ -144,7 +156,10 @@
      left_pad="10"
      name="button land"
      tool_tip="Land"
-     width="35">
+     width="35"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Land" />
@@ -161,15 +176,19 @@
      left="8"
      name="text status"
      top_pad="3"
-     width="285">
+     width="285"
+     font="DejaVu"
+     font.size="LSmall">
         Drag to move, shift-drag to copy
     </text>
    <radio_group
      layout="topleft"
      left="10"
-      height="70"
-      top="59"
-     name="focus_radio_group">
+     height="70"
+     top="59"
+     name="focus_radio_group"
+     font="DejaVu"
+     font.size="LSmall" >
         <radio_item
          top_pad="6"
          label="Zoom"
@@ -198,16 +217,20 @@
      top_delta="-2"
      left_delta="100"
      name="slider zoom"
-     width="134">
+     width="134"
+     font="DejaVu"
+     font.size="LSmall">
 	 <slider_bar.commit_callback
 	     function="BuildTool.commitZoom"/>
 	</slider_bar>
    <radio_group
-      left="10"
-      height="70"
-      top="59"
+     left="10"
+     height="70"
+     top="59"
      layout="topleft"
-     name="move_radio_group">
+     name="move_radio_group"
+     font="DejaVu"
+     font.size="LSmall" >
         <radio_item
          top_pad="6"
          label="Move"
@@ -232,7 +255,9 @@
 	 top="55"
 	 height="70"
      layout="topleft"
-	 name="edit_radio_group">
+	 name="edit_radio_group"
+     font="DejaVu"
+     font.size="LSmall" >
         <radio_item
 		 label="Move"
 		 layout="topleft"
@@ -263,7 +288,9 @@
      label="Edit linked"
      layout="topleft"
      name="checkbox edit linked parts"
-     top_pad="-18">
+     top_pad="-18"
+     font="DejaVu"
+     font.size="LSmall">
 		  <check_box.commit_callback
 			function="BuildTool.selectComponent"/>
 	</check_box>
@@ -276,7 +303,10 @@
      layout="topleft"
      left="143"
      name="link_btn"
-     width="50">
+     width="50"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.LinkObjects"/>
     </button>
@@ -287,7 +317,10 @@
      layout="topleft"
      left_pad="2"
      name="unlink_btn"
-     width="90">
+     width="90"
+     font="DejaVu"
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.UnlinkObjects"/>
     </button>
@@ -298,10 +331,12 @@
      layout="topleft"
      left="143"
      name="checkbox uniform"
-     top="48"
+     top="47"
      label_text.wrap="true"
      label_text.width="100"
-     width="134" />
+     width="134"
+     font="DejaVu"
+     font.size="LSmall" />
     <check_box
      control_name="ScaleStretchTextures"
      height="19"
@@ -310,18 +345,22 @@
      layout="topleft"
      left="143"
      name="checkbox stretch textures"
-     top_pad="-4"
+     top_pad="-2"
      follows="left|top"
-     width="134" />
+     width="134"
+     font="DejaVu"
+     font.size="LSmall" />
    <check_box
      control_name="SnapEnabled"
      height="18"
      initial_value="true"
      label="Snap"
      layout="topleft"
-     top_pad="0"
+     top_pad="-1"
      name="checkbox snap to grid"
-     width="134" />
+     width="134"
+     font="DejaVu"
+     font.size="LSmall"/>
     <combo_box
       height="20"
       layout="topleft"
@@ -331,7 +370,9 @@
       top="83"
       left="195"
       top_pad="0"
-      width="60">
+      width="60"
+      drop_down_button.font="DejaVu"
+      drop_down_button.font.size="LSmall">
       <combo_box.item
       label="World"
       name="World"
@@ -577,7 +618,7 @@
      layout="topleft"
      left_delta="0"
      name="checkbox copy selection"
-     top_delta="15"
+     top_delta="17"
      width="134" />
     <check_box
      control_name="CreateToolCopyCenters"
@@ -587,7 +628,7 @@
      layout="topleft"
      left_delta="18"
      name="checkbox copy centers"
-     top="85"
+     top="92"
      width="134" />
     <check_box
      control_name="CreateToolCopyRotates"
@@ -596,7 +637,7 @@
      layout="topleft"
      left_delta="0"
      name="checkbox copy rotates"
-     top_delta="16"
+     top_delta="17"
      width="134" />
     <radio_group
      height="105"
@@ -604,7 +645,9 @@
      left="4"
      name="land_radio_group"
      top="54"
-     width="114">
+     width="114"
+     font="DejaVu"
+     font.size="LSmall" >
         <radio_item
          height="19"
          label="Select Land"
@@ -746,7 +789,8 @@
 	  length="1"
 	  height="16"
 	  follows="left|top"
-	  font="SansSerifSmall"
+	  font="DejaVu"
+      font.size="LSmall"
 	  layout="topleft"
 	  left="10"
 	  name="selection_empty"
@@ -760,7 +804,8 @@
 	  length="1"
 	  height="16"
 	  follows="left|top"
-	  font="SansSerifSmall"
+	  font="DejaVu"
+      font.size="LSmall"
 	  layout="topleft"
 	  left="10"
 	  name="selection_faces"
@@ -775,7 +820,8 @@
 	  length="1"
 	  height="16"
 	  follows="left|top"
-	  font="SansSerifSmall"
+	  font="DejaVu"
+      font.size="LSmall"
 	  layout="topleft"
 	  left="10"
 	  name="selection_count"
@@ -830,7 +876,9 @@
      tab_height="25"
      open_tabs_on_drag_and_drop="true"
      top="173"
-     width="295">
+     width="295"
+     font="DejaVu"
+     font.size="LSmall">
 	
 <panel
 	 border="false"
@@ -904,7 +952,9 @@
              left="10"
              name="Name:"
              top="5"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall">
                 Name:
             </text>
             <line_editor
@@ -923,7 +973,9 @@
              left="10"
              name="Description:"
              top_pad="3"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall">
                 Description:
             </text>
             <line_editor
@@ -945,7 +997,9 @@
              layout="topleft"
              name="Creator:"
              top_pad="7"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall">
                 Creator:
             </text>
             <avatar_icon
@@ -967,7 +1021,6 @@
              height="29"
              layout="topleft"
              name="Creator Name"
-             font="SansSerifSmall"
              top_delta="-1"
              translate="false"
              width="170"
@@ -984,7 +1037,9 @@
              layout="topleft"
              name="Owner:"
              top_pad="3"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall">
                 Owner:
             </text>
             <avatar_icon
@@ -1015,7 +1070,8 @@
              height="29"
              layout="topleft"
              name="Owner Name"
-             font="SansSerifSmall"
+	         font="DejaVu"
+             font.size="LSmall"
              left_pad="1"
              top_delta="-1"
              translate="false"
@@ -1033,7 +1089,9 @@
              height="18"
              name="Group:"
              top_pad="3"
-             width="75">
+             width="75"
+             font="DejaVu"
+             font.size="LSmall">
                 Group:
             </text>
             <name_box
@@ -1053,7 +1111,10 @@
 			 name="button set group"
 			 tab_stop="false"
 			 tool_tip="Choose a group to share this object's permissions"
-			 width="23" />
+			 width="23"
+             font="DejaVu"
+             font.size="LSmall"
+             pad_bottom="1" />
             <check_box
              height="19"
              follows="left|top"
@@ -1063,7 +1124,9 @@
              tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
              top_pad="5"
              left="100"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <button
              follows="top|left"
              height="23"
@@ -1073,7 +1136,10 @@
              name="button deed"
              left_pad="19"
              tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
-             width="80" />
+             width="80"
+             font="DejaVu"
+             font.size="LSmall"
+             pad_bottom="1" />
             <text
              type="string"
              length="1"
@@ -1083,7 +1149,9 @@
              top_pad="10"
              left="10"
              name="label click action"
-             width="82">
+             width="82"
+             font="DejaVu"
+             font.size="LSmall" >
                 Click to:
             </text>
             <combo_box
@@ -1093,7 +1161,9 @@
              name="clickaction"
              width="130"
              left_pad="10"
-             tool_tip="A click action enables you to interact with an object with a single left click. Each click action has a special cursor indicating what it does. Some click actions have requirements to function. For example Touch and Pay require scripts" >
+             tool_tip="A click action enables you to interact with an object with a single left click. Each click action has a special cursor indicating what it does. Some click actions have requirements to function. For example Touch and Pay require scripts"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Touch  (default)"
                  name="Touch/grab(default)"
@@ -1134,7 +1204,9 @@
              name="checkbox for sale"
              left="7"
              width="97"
-             tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
+             tool_tip="Lets people buy this object, its content or it copy inworld for specified price."
+             font="DejaVu"
+             font.size="LSmall" />
   <!-- NEW PRICE SPINNER
 Objects are allowed to be for sale for L$0 to invoke buy UI behavior
 even though the user gets a free copy.
@@ -1152,7 +1224,9 @@ even though the user gets a free copy.
       min_val="0"
       height="20"
       max_val="999999999"
-      tool_tip="Object cost." />
+      tool_tip="Object cost."
+      font="DejaVu"
+      font.size="LSmall" />
   <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
             left_pad="8"
@@ -1166,7 +1240,9 @@ even though the user gets a free copy.
             mouse_opaque="true"
             name="sale type"
             width="89"
-            tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself." >
+            tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself."
+            drop_down_button.font="DejaVu"
+            drop_down_button.font.size="LSmall" >
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -1188,7 +1264,9 @@ even though the user gets a free copy.
        layout="topleft"
 	   left="7"
        name="search_check"
-       tool_tip="Let people see this object in search results" />
+       tool_tip="Let people see this object in search results"
+       font="DejaVu"
+       font.size="LSmall" />
 		<panel
          border="false"
          follows="left|top"
@@ -1212,7 +1290,9 @@ even though the user gets a free copy.
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
-             width="264">
+             width="264"
+             font="DejaVu"
+             font.size="LSmall" >
                 You can modify this object
             </text>
             <text
@@ -1220,7 +1300,9 @@ even though the user gets a free copy.
                follows="left|top"
                name="Anyone can:"
                width="250"
-               left="10">
+               left="10"
+               font="DejaVu"
+               font.size="LSmall" >
                  Anyone:
             </text>
             <check_box
@@ -1230,7 +1312,9 @@ even though the user gets a free copy.
              name="checkbox allow everyone move"
              tool_tip="Anyone can move the object."
              left="10"
-             width="85" />
+             width="85"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Copy"
@@ -1238,14 +1322,18 @@ even though the user gets a free copy.
              left_pad="0"
              name="checkbox allow everyone copy"
              tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive."
-             width="90" />
+             width="90"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
                type="string"
                follows="left|top"
                height="19"
                name="Next owner can:"
                width="250"
-               left="10">
+               left="10"
+               font="DejaVu"
+               font.size="LSmall" >
                   Next owner:
             </text>
             <check_box
@@ -1256,7 +1344,9 @@ even though the user gets a free copy.
              height="10"
              name="checkbox next owner can modify"
              tool_tip="Next owner can edit properties like item name or scale of this object."
-             width="85" />
+             width="85"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              follows="left|top|right"
              height="19"
@@ -1265,7 +1355,9 @@ even though the user gets a free copy.
              left_pad="0"
              name="checkbox next owner can copy"
              tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
-             width="80" />
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              follows="left|top|right"
              height="19"
@@ -1275,7 +1367,9 @@ even though the user gets a free copy.
              left_pad="0"
              top_delta="0"
              tool_tip="Next owner can give away or resell this object."
-             width="100" />
+             width="100"
+             font="DejaVu"
+             font.size="LSmall" />
 <!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 
      but that's OK, this is used only for debugging. -->
             <text
@@ -1288,7 +1382,9 @@ even though the user gets a free copy.
              left="230"
              name="B:"
              height="10"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 B:
             </text>
             <text
@@ -1301,7 +1397,9 @@ even though the user gets a free copy.
              top_pad="2"
              name="O:"
              height="10"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 O:
             </text>
             <text
@@ -1314,7 +1412,9 @@ even though the user gets a free copy.
              top_pad="2"
              name="G:"
              height="10"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 G:
             </text>
             <text
@@ -1327,7 +1427,9 @@ even though the user gets a free copy.
              layout="topleft"
              name="E:"
              height="10"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 E:
             </text>
             <text
@@ -1340,7 +1442,9 @@ even though the user gets a free copy.
              top_pad="2"
              name="N:"
              height="10"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 N:
             </text>
             <text
@@ -1353,7 +1457,9 @@ even though the user gets a free copy.
              top_pad="2"
              name="F:"
              height="10"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 F:
             </text>
         </panel>
@@ -1373,7 +1479,9 @@ even though the user gets a free copy.
          name="pathfinding_attributes_label"
          top_pad="4"
          width="150"
-         left="10">
+         left="10"
+         font="DejaVu"
+         font.size="LSmall" >
         Pathfinding attributes:
       </text>
       <text
@@ -1383,7 +1491,9 @@ even though the user gets a free copy.
          name="pathfinding_attributes_value"
          width="130"
          word_wrap="false"
-         left_pad="0">
+         left_pad="0"
+         font="DejaVu"
+         font.size="LSmall" >
       </text>
     </panel>
   </panel>
@@ -1408,7 +1518,9 @@ even though the user gets a free copy.
              tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
              top_pad="5"
              left="10"
-             width="123" />
+             width="123"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Physical"
@@ -1416,7 +1528,9 @@ even though the user gets a free copy.
              name="Physical Checkbox Ctrl"
              tool_tip="Allows object to be pushed and affected by gravity"
              top_pad="0"
-             width="123" />
+             width="123"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Temporary"
@@ -1424,7 +1538,9 @@ even though the user gets a free copy.
              name="Temporary Checkbox Ctrl"
              tool_tip="Causes object to be deleted 1 minute after creation"
              top_pad="0"
-             width="123" />
+             width="123"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Phantom"
@@ -1432,7 +1548,9 @@ even though the user gets a free copy.
              name="Phantom Checkbox Ctrl"
              tool_tip="Causes object to not collide with other objects or avatars"
              top_pad="0"
-             width="123" />
+             width="123"
+             font="DejaVu"
+             font.size="LSmall" />
             <view_border
              bevel_style="none"
              follows="top|left"
@@ -1441,7 +1559,9 @@ even though the user gets a free copy.
              left_delta="0"
              name="object_horizontal"
              top_pad="10"
-             width="95" />
+             width="95"
+             font="DejaVu"
+             font.size="LSmall" />
             <menu_button
              menu_filename="menu_copy_paste_pos.xml"
              follows="top|left"
@@ -1465,7 +1585,9 @@ even though the user gets a free copy.
              tool_tip="Position (meters)"
              left_pad="8"
              top_delta="0"
-             width="121">
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" >
                 Position (m)
             </text>
             <spinner
@@ -1482,7 +1604,9 @@ even though the user gets a free copy.
              name="Pos X"
              text_enabled_color="1 0 0.3 .7"
              top_pad="8"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1497,7 +1621,9 @@ even though the user gets a free copy.
              name="Pos Y"
              text_enabled_color="EmphasisColor"
              top_pad="3"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1512,7 +1638,9 @@ even though the user gets a free copy.
              name="Pos Z"
              text_enabled_color="0 0.8 1 .65"
              top_pad="3"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <menu_button
              menu_filename="menu_copy_paste_size.xml"
              follows="top|left"
@@ -1525,7 +1653,7 @@ even though the user gets a free copy.
              top_pad="13"
              name="clipboard_size_btn"
              tool_tip="Paste options"
-             width="19"/>
+             width="19" />
             <text
              type="string"
              length="1"
@@ -1536,7 +1664,9 @@ even though the user gets a free copy.
              top_delta="0"
              name="label size"
              tool_tip="Size (meters)"
-             width="121">
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" >
                 Size (m)
             </text>
             <spinner
@@ -1553,7 +1683,9 @@ even though the user gets a free copy.
              name="Scale X"
              text_enabled_color="1 1 1 1"
              top_pad="8"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1568,7 +1700,9 @@ even though the user gets a free copy.
              name="Scale Y"
              text_enabled_color="1 1 1 1"
              top_pad="3"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1583,7 +1717,9 @@ even though the user gets a free copy.
              name="Scale Z"
              text_enabled_color="1 1 1 1"
              top_pad="3"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <menu_button
              menu_filename="menu_copy_paste_rot.xml"
              follows="top|left"
@@ -1607,7 +1743,9 @@ even though the user gets a free copy.
              top_delta="0"
              name="label rotation"
              tool_tip="Rotation (degrees)"
-             width="121">
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" >
                 Rotation (°)
             </text>
             <spinner
@@ -1625,7 +1763,9 @@ even though the user gets a free copy.
              name="Rot X"
              text_enabled_color="1 1 1 1"
              top_pad="8"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1641,7 +1781,9 @@ even though the user gets a free copy.
              name="Rot Y"
              text_enabled_color="1 1 1 1"
              top_pad="3"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1657,7 +1799,9 @@ even though the user gets a free copy.
              name="Rot Z"
              text_enabled_color="1 1 1 1"
              top_pad="3"
-             width="87" />
+             width="87"
+             font="DejaVu"
+             font.size="LSmall" />
  <!--           <text
              type="string"
              length="1"
@@ -1686,7 +1830,9 @@ even though the user gets a free copy.
              name="comboBaseType"
              top="6"
              left="125"
-             width="125">
+             width="125"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Box"
                  name="Box"
@@ -1742,7 +1888,9 @@ even though the user gets a free copy.
              left="125"
              name="text cut"
              top_pad="5"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Path Cut (begin/end)
             </text>
             <spinner
@@ -1757,7 +1905,9 @@ even though the user gets a free copy.
              max_val="0.98"
              name="cut begin"
              top_pad="4"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="16"
@@ -1770,7 +1920,9 @@ even though the user gets a free copy.
              min_val="0.02"
              name="cut end"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -1780,7 +1932,9 @@ even though the user gets a free copy.
              left="125"
              name="text hollow"
              top_pad="7"
-             width="68">
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" >
                 Hollow
             </text>
             <text
@@ -1791,7 +1945,9 @@ even though the user gets a free copy.
              layout="topleft"
              left_pad="10"
              name="text skew"
-             width="63">
+             width="63"
+             font="DejaVu"
+             font.size="LSmall" >
                 Skew
             </text>
             <spinner
@@ -1805,7 +1961,9 @@ even though the user gets a free copy.
              max_val="95"
              name="Scale 1"
              top_pad="4"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1818,7 +1976,9 @@ even though the user gets a free copy.
              min_val="-0.95"
              name="Skew"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -1828,7 +1988,9 @@ even though the user gets a free copy.
              left="125"
              name="Hollow Shape"
              top_pad="7"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Hollow Shape
             </text>
             <combo_box
@@ -1837,7 +1999,9 @@ even though the user gets a free copy.
              left_delta="0"
              name="hole"
              top_pad="-2"
-             width="150">
+             width="150"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Default"
                  name="Default"
@@ -1864,7 +2028,9 @@ even though the user gets a free copy.
              left_delta="0"
              name="text twist"
              top_pad="7"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Twist (begin/end)
             </text>
             <spinner
@@ -1881,7 +2047,9 @@ even though the user gets a free copy.
              min_val="-180"
              name="Twist Begin"
              top_pad="4"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="0"
              follows="left|top"
@@ -1896,7 +2064,9 @@ even though the user gets a free copy.
              min_val="-180"
              name="Twist End"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -1906,7 +2076,9 @@ even though the user gets a free copy.
              left="125"
              name="scale_taper"
              top_pad="7"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Taper
             </text>
             <text
@@ -1919,7 +2091,9 @@ even though the user gets a free copy.
              left_delta="0"
              name="scale_hole"
              top_delta="0"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Hole Size
             </text>
             <spinner
@@ -1935,7 +2109,9 @@ even though the user gets a free copy.
              min_val="-1"
              name="Taper Scale X"
              top_pad="4"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1949,7 +2125,9 @@ even though the user gets a free copy.
              min_val="-1"
              name="Taper Scale Y"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -1959,7 +2137,9 @@ even though the user gets a free copy.
              left="125"
              name="text topshear"
              top_pad="5"
-             width="141">
+             width="141"
+             font="DejaVu"
+             font.size="LSmall" >
                 Top Shear
             </text>
             <spinner
@@ -1976,7 +2156,9 @@ even though the user gets a free copy.
              min_val="-0.5"
              name="Shear X"
              top_pad="4"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1991,7 +2173,9 @@ even though the user gets a free copy.
              min_val="-0.5"
              name="Shear Y"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
 			 visible="false"
              type="string"
@@ -2002,7 +2186,9 @@ even though the user gets a free copy.
              left="125"
              name="advanced_cut"
              top_pad="7"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Profile Cut (begin/end)
             </text>
             <text
@@ -2015,7 +2201,9 @@ even though the user gets a free copy.
              left_delta="0"
              name="advanced_dimple"
              top_delta="0"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Dimple (begin/end)
             </text>
             <text
@@ -2027,7 +2215,9 @@ even though the user gets a free copy.
              left_delta="0"
              name="advanced_slice"
              top_delta="0"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Slice (begin/end)
             </text>
             <spinner
@@ -2042,7 +2232,9 @@ even though the user gets a free copy.
              max_val="0.98"
              name="Path Limit Begin"
              top_pad="3"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2055,7 +2247,9 @@ even though the user gets a free copy.
              min_val="0.02"
              name="Path Limit End"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
 			 visible="false"
              type="string"
@@ -2066,7 +2260,9 @@ even though the user gets a free copy.
              left="125"
              name="text taper2"
              top_pad="7"
-             width="150">
+             width="150"
+             font="DejaVu"
+             font.size="LSmall" >
                 Taper
             </text>
             <spinner
@@ -2083,7 +2279,9 @@ even though the user gets a free copy.
              min_val="-1"
              name="Taper X"
              top_pad="3"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
 			 visible="false"
              decimal_digits="2"
@@ -2098,7 +2296,9 @@ even though the user gets a free copy.
              min_val="-1"
              name="Taper Y"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
 			 visible="false"
              type="string"
@@ -2109,7 +2309,9 @@ even though the user gets a free copy.
              left="125"
              name="text radius delta"
              top_pad="7"
-             width="78">
+             width="78"
+             font="DejaVu"
+             font.size="LSmall" >
                 Radius
             </text>
             <text
@@ -2121,7 +2323,9 @@ even though the user gets a free copy.
              layout="topleft"
              left_delta="78"
              name="text revolutions"
-             width="68">
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" >
                 Revolutions
             </text>
             <spinner
@@ -2135,7 +2339,9 @@ even though the user gets a free copy.
              min_val="-1"
              name="Radius Offset"
              top_pad="4"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
 			 visible="false"
              decimal_digits="2"
@@ -2148,7 +2354,9 @@ even though the user gets a free copy.
              min_val="1"
              name="Revolutions"
              top_delta="0"
-             width="68" />
+             width="68"
+             font="DejaVu"
+             font.size="LSmall" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2161,7 +2369,9 @@ even though the user gets a free copy.
              tool_tip="Click to choose a picture"
              top="70"
              visible="false"
-             width="145" />
+             width="145"
+             caption_text.font="DejaVu"
+             caption_text.font.size="LSmall" />
             <check_box
              height="19"
              label="Mirror"
@@ -2171,7 +2381,9 @@ even though the user gets a free copy.
              tool_tip="Flips sculpted prim along the X axis"
              top_pad="8"
              visible="false"
-             width="130" />
+             width="130"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Inside-out"
@@ -2181,7 +2393,9 @@ even though the user gets a free copy.
              tool_tip="Inverts the sculpted prims normals, making it appear inside-out"
              top_pad="4"
              visible="false"
-             width="121" />
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -2192,7 +2406,9 @@ even though the user gets a free copy.
              name="label sculpt type"
              top_pad="10"
              visible="false"
-             width="130">
+             width="130"
+             font="DejaVu"
+             font.size="LSmall" >
                 Stitching type
             </text>
             <combo_box
@@ -2202,7 +2418,9 @@ even though the user gets a free copy.
              name="sculpt type control"
              top_pad="4"
              visible="false"
-             width="150">
+             width="150"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Sphere"
                  name="Sphere"
@@ -2259,7 +2477,9 @@ even though the user gets a free copy.
              name="select_single"
              top="5"
              width="252"
-             word_wrap="true">
+             word_wrap="true"
+             font="DejaVu"
+             font.size="LSmall" >
                 Select only one primitive to edit features.
             </text>
             <text
@@ -2271,7 +2491,9 @@ even though the user gets a free copy.
              left="10"
              name="edit_object"
              top="5"
-             width="252">
+             width="252"
+             font="DejaVu"
+             font.size="LSmall" >
                 Edit object features:
             </text>
             <check_box
@@ -2282,7 +2504,9 @@ even though the user gets a free copy.
              name="Animated Mesh Checkbox Ctrl"
              tool_tip="Allows rigged mesh objects to be animated independently"
              top_pad="10"
-             width="121" />
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="10"
              label="Flexible Path"
@@ -2292,7 +2516,9 @@ even though the user gets a free copy.
              name="Flexible1D Checkbox Ctrl"
              tool_tip="Allows object to flex about the Z axis (Client-side only)"
              top_pad="15"
-             width="121" />
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2305,7 +2531,9 @@ even though the user gets a free copy.
              max_val="3"
              name="FlexNumSections"
              top_pad="10"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2319,7 +2547,9 @@ even though the user gets a free copy.
              min_val="-10"
              name="FlexGravity"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2332,7 +2562,9 @@ even though the user gets a free copy.
              max_val="10"
              name="FlexFriction"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2345,7 +2577,9 @@ even though the user gets a free copy.
              max_val="10"
              name="FlexWind"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2358,7 +2592,9 @@ even though the user gets a free copy.
              max_val="10"
              name="FlexTension"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2372,7 +2608,9 @@ even though the user gets a free copy.
              min_val="-10"
              name="FlexForceX"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2386,7 +2624,9 @@ even though the user gets a free copy.
              min_val="-10"
              name="FlexForceY"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -2400,7 +2640,9 @@ even though the user gets a free copy.
              min_val="-10"
              name="FlexForceZ"
              top_pad="4"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
             <view_border
              bevel_style="none"
              follows="top|left"
@@ -2409,7 +2651,9 @@ even though the user gets a free copy.
              left="8"
              name="object_horizontal"
              top_pad="10"
-             width="278" />
+             width="278"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="16"
              label="Light"
@@ -2418,7 +2662,9 @@ even though the user gets a free copy.
              name="Light Checkbox Ctrl"
              tool_tip="Causes object to emit light"
              top_pad="8"
-             width="60" />
+             width="60"
+             font="DejaVu"
+             font.size="LSmall" />
             <color_swatch
              can_apply_immediately="true"
              color="0.5 0.5 0.5 1"
@@ -2430,7 +2676,9 @@ even though the user gets a free copy.
              top_pad="-17"
              name="colorswatch"
              tool_tip="Click to open color picker"
-             width="40" />
+             width="40"
+             font="DejaVu"
+             font.size="LSmall" />
          <texture_picker
             allow_no_texture="true"
             top_delta="0"
@@ -2443,7 +2691,9 @@ even though the user gets a free copy.
             mouse_opaque="true"
             name="light texture control"
             tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"
-            width="32" />
+            width="32"
+            caption_text.font="DejaVu"
+            caption_text.font.size="LSmall" />
          <menu_button
               menu_filename="menu_copy_paste_light.xml"
               follows="top|left"
@@ -2467,7 +2717,9 @@ even though the user gets a free copy.
              left="10"
              name="Light Intensity"
              top_pad="26"
-             width="128" />
+             width="128"
+             font="DejaVu"
+             font.size="LSmall" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
                    follows="left|top"
@@ -2481,7 +2733,9 @@ even though the user gets a free copy.
                    min_val="0"
                    mouse_opaque="true"
                    name="Light FOV"
-                   width="120" />
+                   width="120"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <spinner follows="left|top"
                    height="19"
                    initial_value="5"
@@ -2492,7 +2746,9 @@ even though the user gets a free copy.
                    max_val="20"
                    name="Light Radius"
                    top_pad="3"
-                   width="128" />
+                   width="128"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
                    follows="left|top"
@@ -2506,7 +2762,9 @@ even though the user gets a free copy.
                    min_val="-20"
                    mouse_opaque="true"
                    name="Light Focus"
-                   width="120" />
+                   width="120"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <spinner follows="left|top"
                    height="19"
                    increment="0.25"
@@ -2518,7 +2776,9 @@ even though the user gets a free copy.
                    max_val="2"
                    name="Light Falloff"
                    top_pad="3"
-                   width="128" />
+                   width="128"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
                    follows="left|top"
@@ -2532,7 +2792,9 @@ even though the user gets a free copy.
                    min_val="0"
                    mouse_opaque="true"
                    name="Light Ambiance"
-                   width="120" />
+                   width="120"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <check_box
              height="16"
              label="Reflection Probe"
@@ -2541,15 +2803,19 @@ even though the user gets a free copy.
              name="Reflection Probe"
              tool_tip="Adjusts how objects within this volume receive reflections when PBR is enabled"
              top_pad="10"
-             width="60" />
+             width="60"
+             font="DejaVu"
+             font.size="LSmall" />
           <combo_box
 			   height="19"
 			   top_delta="0"
-         left="144"
+               left="144"
 			   follows="left|top"
 			   name="Probe Volume Type"
 			   tool_tip="Choose the probe influence volume"
-			   width="140">
+			   width="140"
+               drop_down_button.font="DejaVu"
+               drop_down_button.font.size="LSmall" >
             <combo_box.item
              label="Sphere"
              name="Sphere"
@@ -2568,7 +2834,9 @@ even though the user gets a free copy.
            name="Probe Dynamic"
            tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume."
            bottom_delta="19"
-           width="60" />
+           width="60"
+           font="DejaVu"
+           font.size="LSmall" />
           
           <text
             bottom_delta="-8"
@@ -2580,7 +2848,9 @@ even though the user gets a free copy.
              left="10"
              name="Probe Update Label"
              text_readonly_color="LabelDisabledColor"
-             width="100">
+             width="100"
+             font="DejaVu"
+             font.size="LSmall" >
             Probe Update
           </text>
           <combo_box
@@ -2590,7 +2860,9 @@ even though the user gets a free copy.
 			   follows="left|top"
 			   name="Probe Update Type"
 			   tool_tip="Determines how the probe updates.  Static updates the slowest and without avatars.  Dynamic updates more frequently, with avatars visible in the probes.  Mirror (Environment) turns this probe into a realtime planar projected probe that only reflects the environment, but does not calculate ambiance.  Mirror (Everything) is similar to Mirror (Environment), but it reflects particles and avatars."
-			   width="140">
+			   width="140"
+               drop_down_button.font="DejaVu"
+               drop_down_button.font.size="LSmall" >
             <combo_box.item
              label="Static"
              name="Static"
@@ -2621,7 +2893,9 @@ even though the user gets a free copy.
                    min_val="0"
                    mouse_opaque="true"
                    name="Probe Ambiance"
-                   width="120" />
+                   width="120"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
                    follows="left|top"
@@ -2635,7 +2909,9 @@ even though the user gets a free copy.
                    min_val="0"
                    mouse_opaque="true"
                    name="Probe Near Clip"
-                   width="120" />
+                   width="120"
+                   font="DejaVu"
+                   font.size="LSmall" />
           <text
              type="string"
              length="1"
@@ -2644,7 +2920,9 @@ even though the user gets a free copy.
              layout="topleft"
              name="label physicsshapetype"
              top="38"
-             width="121">
+             width="121"
+             font="DejaVu"
+             font.size="LSmall" >
                 Physics Shape Type:
             </text>
 			<combo_box
@@ -2654,13 +2932,17 @@ even though the user gets a free copy.
 			   follows="left|top"
 			   name="Physics Shape Type Combo Ctrl"
 			   tool_tip="Choose the physics shape type"
-			   width="108"/>
+			   width="108"
+               drop_down_button.font="DejaVu"
+               drop_down_button.font.size="LSmall" />
             <combo_box
              height="19"
              layout="topleft"
              name="material"
              top_pad="5"
-             width="150">
+             width="150"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Stone"
                  name="Stone"
@@ -2703,7 +2985,9 @@ even though the user gets a free copy.
              max_val="28"
              name="Physics Gravity"
              top_pad="10"
-             width="132" />
+             width="132"
+             font="DejaVu"
+             font.size="LSmall" />
 
             <spinner
              follows="left|top"
@@ -2718,7 +3002,9 @@ even though the user gets a free copy.
              min_val="0"
              name="Physics Friction"
              top_pad="4"
-             width="132" />
+             width="132"
+             font="DejaVu"
+             font.size="LSmall" />
 
             <spinner
              follows="left|top"
@@ -2734,7 +3020,9 @@ even though the user gets a free copy.
              min_val="1"
              name="Physics Density"
              top_pad="4"
-             width="132" />
+             width="132"
+             font="DejaVu"
+             font.size="LSmall" />
 
             <spinner
              follows="left|top"
@@ -2749,7 +3037,9 @@ even though the user gets a free copy.
              min_val="0"
              name="Physics Restitution"
              top_pad="8"
-             width="132" />
+             width="132"
+             font="DejaVu"
+             font.size="LSmall" />
         </panel>
          <panel
          label="Texture"
@@ -2777,7 +3067,10 @@ even though the user gets a free copy.
              left="8"
              name="button new script"
              top="10"
-             width="134" />
+             width="134"
+             font="DejaVu"
+             font.size="LSmall"
+             pad_bottom="1" />
             <button
              follows="left|top"
              height="23"
@@ -2785,7 +3078,10 @@ even though the user gets a free copy.
              layout="topleft"
              left_pad="8"
              name="button permissions"
-             width="134" />
+             width="134"
+             font="DejaVu"
+             font.size="LSmall"
+             pad_bottom="1" />
             <filter_editor
              follows="left|top|right"
              label="Enter filter text"
@@ -2822,7 +3118,8 @@ even though the user gets a free copy.
     <text
          type="string"
          length="1"
-         font="SansSerifBig"
+         font="DejaVu"
+         font.size="Small"
          follows="left|top"
          height="19"
          layout="topleft"
@@ -2841,7 +3138,9 @@ even though the user gets a free copy.
          left="30"
          name="label_area_price"
          top="48"
-         width="150">
+         width="150"
+         font="DejaVu"
+         font.size="LSmall" >
             Price: L$[PRICE] for [AREA] m²
         </text>
         <text
@@ -2853,7 +3152,9 @@ even though the user gets a free copy.
          left_delta="0"
          name="label_area"
          top_delta="0"
-         width="150">
+         width="150"
+         font="DejaVu"
+         font.size="LSmall" >
             Area: [AREA] m²
         </text>
         <button
@@ -2865,7 +3166,10 @@ even though the user gets a free copy.
          left_delta="0"
          name="button about land"
          top_pad="4"
-         width="125" />
+         width="125"
+         font="DejaVu"
+         font.size="LSmall"
+         pad_bottom="1" />
         <check_box
          control_name="ShowParcelOwners"
          height="19"
@@ -2875,11 +3179,14 @@ even though the user gets a free copy.
          name="checkbox show owners"
          tool_tip="Colorize the parcels according to the type of owner: &#10;&#10;Green = Your land &#10;Aqua = Your group&apos;s land &#10;Red = Owned by others &#10;Yellow = For sale &#10;Purple = For auction &#10;Grey = Public"
          top_pad="8"
-         width="205" />
+         width="205"
+         font="DejaVu"
+         font.size="LSmall" />
         <text
          type="string"
          length="1"
-         font="SansSerifBig"
+         font="DejaVu"
+         font.size="Small"
          follows="left|top"
          height="19"
          layout="topleft"
@@ -2898,7 +3205,10 @@ even though the user gets a free copy.
          left="30"
          name="button subdivide land"
          top="172"
-         width="125" />
+         width="125"
+         font="DejaVu"
+         font.size="LSmall"
+         pad_bottom="1" />
         <button
          follows="left|top"
          height="23"
@@ -2908,11 +3218,15 @@ even though the user gets a free copy.
          left_delta="0"
          name="button join land"
          top_pad="4"
-         width="125" />
+         width="125"
+         font="DejaVu"
+         font.size="LSmall"
+         pad_bottom="1" />
         <text
          type="string"
          length="1"
-         font="SansSerifBig"
+         font="DejaVu"
+         font.size="Small"
          follows="left|top"
          height="19"
          layout="topleft"
@@ -2931,7 +3245,10 @@ even though the user gets a free copy.
          left="30"
          name="button buy land"
          top="276"
-         width="125" />
+         width="125"
+         font="DejaVu"
+         font.size="LSmall"
+         pad_bottom="1" />
         <button
          follows="left|top"
          height="23"
@@ -2941,7 +3258,10 @@ even though the user gets a free copy.
          left_delta="0"
          name="button abandon land"
          top_pad="4"
-         width="125" />
+         width="125"
+         font="DejaVu"
+         font.size="LSmall"
+         pad_bottom="1" />
  </panel>
 <!-- end of tabs -->
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
index c0d260ef59..279a05748d 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -22,7 +22,7 @@
 		increment="0.025"
 		initial_value="0.5"
 		label="Voice Chat"
-		label_width="60"
+		label_width="62"
 		layout="topleft"
 		left="15"
 		top="50"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 9c4ccc0e8d..6535a9a079 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -167,7 +167,7 @@
      follows="top|right"
      halign="left"
      height="16"
-     top_delta="-2"
+     top_delta="-5"
      left_pad="7"
      layout="topleft"
      name="person_label"
@@ -181,9 +181,9 @@
      layout="topleft"
      left="3"
      name="infohub_chk"
-     top_pad="3"
+     top_pad="7"
      width="22" />
-         <icon
+    <icon
      follows="top|right"
      height="16"
      image_name="map_infohub.tga"
@@ -191,7 +191,7 @@
      left_pad="0"
      mouse_opaque="true"
      name="infohub"
-     top_delta="0"
+     top_delta="-3"
      width="16" />
  <text
      type="string"
@@ -199,7 +199,7 @@
      follows="top|right"
      halign="left"
      height="16"
-     top_delta="2"
+     top_delta="0"
      left_pad="3"
      layout="topleft"
      name="infohub_label"
@@ -213,7 +213,7 @@
      layout="topleft"
      left="3"
      name="land_for_sale_chk"
-     top_pad="2"
+     top_pad="8"
      width="22" />
     <icon
      follows="top|right"
@@ -222,16 +222,16 @@
      layout="topleft"
      mouse_opaque="true"
      name="landforsale"
-     top_delta="0"
+     top_delta="-3"
      left_pad="0"
      width="16" />
-         <text
+    <text
      type="string"
      length="1"
      follows="top|right"
      halign="left"
      height="16"
-     top_delta="2"
+     top_delta="1"
      left_pad="3"
      layout="topleft"
      name="land_sale_label"
@@ -257,7 +257,7 @@
      layout="topleft"
      left_pad="0"
      name="auction_label"
-     top_delta="3"
+     top_delta="1"
      width="170">
         land auction
     </text>
@@ -270,7 +270,7 @@
      mouse_opaque="true"
      name="square2_owner"
      left="20"
-     top_pad="-5"
+     top_pad="-2"
      width="16" />
     <text
      type="string"
@@ -280,7 +280,7 @@
      layout="topleft"
      left_pad="0"
      name="by_owner_label"
-     top_delta="3"
+     top_delta="0"
      width="100">
        by owner
     </text>
@@ -290,7 +290,7 @@
      control_name="MapShowGridCoords"
      layout="topleft"
      follows="top|right"
-     top_pad="2"
+     top_pad="5"
      left="3"
      height="16"
      width="22"
@@ -300,8 +300,8 @@
      type="string"
      layout="topleft"
      follows="top|right"
-     top_delta="2"
-     left_pad="3"
+     top_delta="-2"
+     left_pad="2"
      height="16"
      width="220"
      halign="left"
@@ -357,7 +357,7 @@
      height="16"
      layout="topleft"
      left="135"
-     top_pad="1"
+     top_pad="5"
      name="event_chk"
      width="22" />
          <icon
@@ -367,6 +367,7 @@
      layout="topleft"
      mouse_opaque="true"
      name="event"
+     top_delta="-2"
      left_pad="0"
      width="18" />
       <text
@@ -375,7 +376,7 @@
      follows="top|right"
      halign="left"
      height="16"
-     top_delta="2"
+     top_delta="0"
      left_pad="3"
      layout="topleft"
      name="pg_label"
@@ -391,7 +392,7 @@
      layout="topleft"
      left="135"
      name="events_mature_chk"
-     top_pad="3"
+     top_pad="7"
      width="22" />
     <icon
      follows="top|right"
@@ -400,16 +401,16 @@
      layout="topleft"
      mouse_opaque="true"
      name="events_mature_icon"
-     top_delta="0"
+     top_delta="-2"
      left_pad="0"
      width="18" />
-           <text
+    <text
      type="string"
      length="1"
      follows="top|right"
      halign="left"
      height="16"
-     top_delta="2"
+     top_delta="0"
      left_pad="3"
      layout="topleft"
      name="events_mature_label"
@@ -424,7 +425,7 @@
      layout="topleft"
      left="135"
      name="events_adult_chk"
-     top_pad="3"
+     top_pad="7"
      width="22" />
     <icon
      follows="top|right"
@@ -434,15 +435,15 @@
      left_pad="0"
      mouse_opaque="true"
      name="events_adult_icon"
-     top_delta="0"
+     top_delta="-2"
      width="18" />
-                <text
+    <text
      type="string"
      length="1"
      follows="top|right"
      halign="left"
      height="16"
-     top_delta="2"
+     top_delta="0"
      left_pad="3"
      layout="topleft"
      name="events_adult_label"
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 45ec1e27f1..81f5d8afe2 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <fonts>
 
-  <font name="default" comment="default font files (global fallbacks)">
-    <file>DejaVuSans.ttf</file>
+  <font
+      name="default"
+      comment="default font files (global fallbacks)">
+    <file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file>
+    <file size_delta="-0.5">DejaVuSans.ttf</file>
     <file functor="is_emoji">TwemojiSVG.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
@@ -31,9 +34,11 @@
     </os>
   </font>
 
-  <font name="SansSerifBold"
-	comment="Name of bold sans-serif font">
-    <file>DejaVuSans-Bold.ttf</file>
+  <font
+      name="SansSerifBold"
+      comment="Name of bold sans-serif font">
+      <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-ExtraBold.ttf</file>
+      <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
     <os name="Windows">
       <file>arialbd.ttf</file>
       </os>
@@ -42,8 +47,11 @@
       </os>
   </font>
 
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>DejaVuSans.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of san-serif font (Truetype file name)">
+    <file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file>
+    <file size_delta="-0.5">DejaVuSans.ttf</file>
     <os name="Windows">
       <file>arial.ttf</file>
       </os>
@@ -52,31 +60,38 @@
       </os>
   </font>
 
-  <font name="SansSerif"
-	comment="Name of bold sans-serif font"
-	font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of bold sans-serif font"
+      font_style="BOLD">
+    <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-Bold.ttf</file>
+    <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
   </font>
 
-  <font name="SansSerif"
-	comment="Name of italic sans-serif font"
-	font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of italic sans-serif font"
+      font_style="ITALIC">
+    <file load_collection="true">Inter_18pt-Italic.ttf</file>
+    <file size_delta="-0.5">DejaVuSans-Oblique.ttf</file>
   </font>
 
-  <font name="SansSerif"
-	comment="Name of bold italic sans-serif font"
-	font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of bold italic sans-serif font"
+      font_style="BOLD|ITALIC">
+    <file load_collection="true">Inter_18pt-BoldItalic.ttf</file>
+    <file size_delta="-0.5">DejaVuSans-BoldOblique.ttf</file>
   </font>
 
   <font name="Emoji"
 	comment="Name of emoji font">
     <file>TwemojiSVG.ttf</file>
   </font>
-
-  <font name="Monospace"
-	comment="Name of monospace font">
+  
+  <font
+      name="Monospace"
+      comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
   </font>
 
@@ -103,9 +118,11 @@
     <file>DejaVuSans-BoldOblique.ttf</file>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font">
-    <file>DejaVuSans.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font">
+    <file font_hinting="default">Inter_18pt-Regular.ttf</file>
+    <file size_delta="-0.5">DejaVuSans.ttf</file>
     <os name="Windows">
       <file>arial.ttf</file>
       </os>
@@ -114,10 +131,12 @@
       </os>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (bold)"
-	font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font (bold)"
+      font_style="BOLD">
+    <file font_hinting="default" flags="bold">Inter_18pt-ExtraBold.ttf</file>
+    <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
     <os name="Windows">
       <file>arialbd.ttf</file>
       </os>
@@ -126,10 +145,12 @@
       </os>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (italic)"
-	font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font (italic)"
+      font_style="ITALIC">
+    <file>Inter_18pt-Italic.ttf</file>
+    <file size_delta="-0.5">DejaVuSans-Oblique.ttf</file>
     <os name="Windows">
       <file>ariali.ttf</file>
       </os>
@@ -138,10 +159,12 @@
       </os>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (bold italic)"
-	font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font (bold italic)"
+      font_style="BOLD|ITALIC">
+    <file>Inter_18pt-BoldItalic.ttf</file>
+    <file size_delta="-0.5">DejaVuSans-BoldOblique.ttf</file>
     <os name="Windows">
       <file>arialbi.ttf</file>
       </os>
@@ -150,33 +173,38 @@
       </os>
   </font>
 
-  <font name="OverrideTest"
-	comment="Name of font to test overriding">
+  <font
+      name="OverrideTest"
+      comment="Name of font to test overriding">
     <file>times.ttf</file>
-    <file>DejaVuSans.ttf</file>
+    <file font_hinting="default">Inter_18pt-Regular.ttf</file>
   </font>
 
   <font_size name="Monospace"
-	     comment="Size for monospaced font (points, or 1/72 of an inch)"
-	     size="8.0"
-	     />
+         comment="Size for monospaced font (points, or 1/72 of an inch)"
+         size="8.0"
+         />
   <font_size name="Huge"
-	     comment="Size of huge font (points, or 1/72 of an inch)"
-	     size="16.0"
-	     />
+         comment="Size of huge font (points, or 1/72 of an inch)"
+         size="16.0"
+         />
   <font_size name="Large"
-	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="10.6"
-	     />
+         comment="Size of large font (points, or 1/72 of an inch)"
+         size="11.0"
+         />
   <font_size name="Medium"
-	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="8.6"
-	     />
+         comment="Size of medium font (points, or 1/72 of an inch)"
+         size="10"
+         />
   <font_size name="Small"
-	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="7.6"
-	     />
-  <font_size name="SmallLSL"
+         comment="Size of small font (points, or 1/72 of an inch)"
+         size="9"
+         />
+   <font_size name="LSmall"
+         comment="Legacy size of small font (points, or 1/72 of an inch)"
+         size="7.6"
+         />
+<font_size name="SmallLSL"
          comment="Size of small font for LSL editor (points, or 1/72 of an inch)"
          size="7"
          />
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index c190d9610f..226454df7c 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -9,7 +9,7 @@
  bg_opaque_image="Inspector_Background" 
  can_close="false"
  can_minimize="false"
- height="158"
+ height="188"
  layout="topleft"
  name="inspect_group"
  single_instance="true"
@@ -47,7 +47,7 @@
   </text>
   <text
    follows="all"
-   height="45"
+   height="65"
    left="8"
    name="group_details"
    use_ellipses="true"
@@ -80,7 +80,7 @@ L$123 to join
    height="23"
    label="Join"
    left="8"
-   top="125"
+   top="156"
    name="join_btn"
    width="103"
    commit_callback.function="InspectGroup.Join"/>
@@ -89,7 +89,7 @@ L$123 to join
    height="23"
    label="Leave"
    left="8"
-   top="125"
+   top="156"
    name="leave_btn"
    width="103"
    commit_callback.function="InspectGroup.Leave"/>
@@ -98,7 +98,7 @@ L$123 to join
      height="23"
      label="View Profile"
      name="view_profile_btn"
-     top="125"
+     top="156"
      left="117"
      width="103"
      commit_callback.function="InspectGroup.ViewProfile" />
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 970c6ad2f5..2b5682bf06 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -61,7 +61,7 @@
      left_pad="5"
      name="avatar_name"
      parse_urls="false"
-     top="6"
+     top="5"
      use_ellipses="true"
      value="(loading)"
      width="0" />
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
index 5ac0bf54de..6b4312a22a 100644
--- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -65,7 +65,7 @@
      left_pad="5"
      name="item_name"
      parse_urls="false"
-     top="6"
+     top="4"
      use_ellipses="true"
      width="180" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 4f48911376..dde2df7128 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -23,7 +23,7 @@
     <text
       parse_urls="false"
       allow_scroll="false"
-      v_pad = "6"
+      v_pad = "4"
       read_only = "true"
       follows="left|right"
       font.style="BOLD"
@@ -49,7 +49,7 @@
     left_pad="5"
     name="time_box"
     right="-5"
-    top="7"
+    top="5"
     value="23:30"
     width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index 5406497930..c43f82c0f1 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -109,7 +109,7 @@
                  image_overlay_alignment="center"
                  image_pressed="WellButton_Lit"
                  image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
+                 image_selected="PushButton_Selected"
                  label_color="Black"
                  left="0"
                  name="Unread"
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 7902588598..90e367543e 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -78,7 +78,7 @@
 		     left="5"
 		     name="conversation_title"
 		     parse_urls="false"
-		     top="6"
+		     top="4"
 		     use_ellipses="true"
 		     value="(loading)"
 		     width="35" />
@@ -86,6 +86,7 @@
 		     auto_update="true"
 		     follows="top|right"
 		     draw_border="false"
+		     top="6"
 		     height="16"
 		     layout="topleft"
 		     left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index bd0335df6e..7c528c5319 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -15,7 +15,7 @@
      <string name="height_value_label_color" translate="false">White</string>
      <text
          follows="top|left|right"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          halign="right"
          height="12"
          layout="topleft"
@@ -36,7 +36,7 @@
          layout="topleft"
 		 left="10"
          name="accordion_panel"
-		 top_pad="0"
+		 top_pad="5"
          width="313">
 	 <accordion
         layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index bb07476ad0..7867361623 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -47,12 +47,14 @@
     <text
       name="lbl name part"
       left="0"
+      top_pad="1"
       follows="top|left|right"
       right="-1">
       Enter part of the name:
     </text>
     <line_editor
       left="0"
+      top_pad="9"
       follows="left|top|right"
       name="edit"
       height="18"
@@ -121,7 +123,7 @@
       draw_heading="true"
       left="0"
       right="-1"
-      height="239"
+      height="236"
       top_pad="4"
       follows="all" 
       column_padding="5"
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 45df40bc05..1e4925a141 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -7,7 +7,7 @@
  top="0"
  left="0"
  height="768"
- width="247">
+ width="257">
   <check_box
     follows="left|top"
     layout="topleft"
@@ -20,7 +20,7 @@
   <panel
     border="true"
     follows="left|top"
-    width="246"
+    width="256"
     height="196"
     layout="topleft"
     left="1"
@@ -175,7 +175,7 @@
   <panel
     border="true"
     follows="left|top"
-    width="246"
+    width="256"
     height="175"
     layout="topleft"
     left="1"
@@ -252,7 +252,7 @@
       layout="topleft"
       left_delta="0"
       top_pad="5"
-      width="96"
+      width="102"
       name="roughness_factor_lbl">
       Roughness Factor
     </text>
@@ -273,7 +273,7 @@
   <panel
     border="true"
     follows="left|top"
-    width="246"
+    width="256"
     height="175"
     layout="topleft"
     left="1"
@@ -343,7 +343,7 @@
   <panel
     border="true"
     follows="left|top"
-    width="246"
+    width="256"
     height="175"
     layout="topleft"
     left="1"
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index ff6af88707..dff00e4e60 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -44,7 +44,7 @@
      layout="topleft"
      left_pad="5"
      name="group_name"
-     top="6"
+     top="4"
      use_ellipses="true"
      value="Unknown"
      width="242" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 1162dcf20d..b1d5086a29 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -28,7 +28,7 @@ You can turn off Notices on the General tab.
      left="5"
      name="lbl2"
      right="-1"
-     top="5"
+     top="3"
      width="300">
      Notices are kept for 14 days.
 Maximum 200 per group daily
@@ -42,7 +42,7 @@ Maximum 200 per group daily
      left="0"
      right="-1"
      name="notice_list"
-     top_pad="0"
+     top_pad="6"
      width="304">
         <scroll_list.columns
          label=""
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 0682a5d680..77fcb25692 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -6,7 +6,7 @@
   name="panel_login"
   focus_root="true"
   background_visible="true"
-  bg_opaque_color="0.0 0.0 0.0 1"
+  bg_opaque_color="DkGrayLogin"
   background_opaque="true"
   width="1024">
   <panel.string
@@ -18,182 +18,379 @@
     https://join.secondlife.com/
   </panel.string>
   <layout_stack
-  follows="left|right|top"
-  height="172"
-  left="0"
-  name="ui_stack"
-  orientation="horizontal"
-  top="10"
-  width="1024">
+   follows="all"
+   layout="topleft"
+   orientation="horizontal"
+   name="main_stack"
+   border_size="0"
+   animate="false"
+   top="0"
+   left="0"
+   height="768"
+   width="1024">
+    <layout_panel
+     auto_resize="true"
+     user_resize="false"
+     layout="topleft"
+     name="left_spacer"
+     background_visible="false"
+     min_width="0"
+     expanded_min_dim="0"
+     width="1">
+    </layout_panel>
     <layout_panel
-      height="172"
-      auto_resize="true"
-      name="ui_elastic_pad_left"
-      width="32" />
+     auto_resize="false"
+     user_resize="false"
+     layout="topleft"
+     name="center_stage"
+     background_visible="true"
+     bg_opaque_color="DkGrayLogin"
+     background_opaque="true"
+     width="1008"
+     height="768">
+      <layout_stack
+       follows="all"
+       layout="topleft"
+       orientation="horizontal"
+       name="ui_stack"
+       border_size="0"
+       animate="false"
+       top="0"
+       left="0"
+       height="768"
+       width="1008">
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"
+         layout="topleft"
+         name="ui_container"
+         width="300"
+         height="768"
+         background_visible="true"
+         bg_opaque_color="PanelDark"
+         background_opaque="true">
+          <icon
+           height="77"
+           width="160"
+           image_name="login_sl_logo_horizontal"
+           layout="topleft"
+           follows="left|top"
+           left="70"
+           top="39"
+           name="sl_logo_small" />
+          <icon
+           left="40"
+           top_pad="30"
+           width="220"
+           height="28"
+           image_name="TextField_Active"
+           layout="topleft"
+           follows="left|top"
+           name="text_field_bg1" />
+          <combo_box
+           left="40"
+           top_delta="0"
+           allow_text_entry="true"
+           follows="left|top"
+           layout="topleft"
+           height="28"
+           label="Username"
+           combo_editor.font="SansSerifLarge"
+           max_chars="128"
+           combo_editor.commit_on_focus_lost="false"
+           combo_editor.prevalidator="ascii"
+           tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+           name="username_combo"
+           width="220">
+              <combo_box.combo_button
+               image_overlay="ComboButton_Arrow"
+               image_overlay_right_delta="10"
+               image_unselected="ComboButton_Transparent"
+               hover_glow_amount="0"
+               image_selected="ComboButton_Transparent"
+               image_disabled="ComboButton_Transparent" />
+              <combo_box.combo_editor
+               background_image="TextField_Transparent"
+               background_image_disabled="TextField_Transparent"
+               background_image_focused="TextField_Transparent"
+               draw_focus_border="false"
+               text_pad_left="8"
+               bg_image_always_focused="true"/>
+          </combo_box>
+          <check_box
+           follows="left|top"
+           font="SansSerifMedium"
+           label_text.text_color="White"
+           top_pad="3"
+           layout="topleft"
+           height="24"
+           label="Remember username"
+           word_wrap="down"
+           check_button.bottom="3"
+           name="remember_name"
+           tool_tip="Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames."
+           width="198">
+              <check_box.label_text left="23"/>
+              <check_box.check_button
+               image_selected="Checkbox_Slim_On"
+               image_unselected="Checkbox_Slim_Off"
+               image_pressed="Checkbox_Slim_Off"
+               image_pressed_selected="Checkbox_Slim_Off"/>
+          </check_box>
+          <line_editor
+           follows="left|top"
+           height="28"
+           top_pad="20"
+           max_length_chars="16"
+           text_pad_left="8"
+           name="password_edit"
+           label="Password"
+           bg_image_always_focused="true"
+           font="SansSerifLarge"
+           is_password="true"
+           select_on_focus="true"
+           draw_focus_border="false"
+           commit_on_focus_lost="false"
+           width="220" />
+          <check_box
+           control_name="RememberPassword"
+           follows="left|top"
+           font="SansSerifMedium"
+           label_text.text_color="White"
+           height="24"
+           top_pad="3"
+           label="Remember password"
+           word_wrap="down"
+           check_button.bottom="3"
+           name="remember_password"
+           width="165">
+              <check_box.label_text left="23"/>
+              <check_box.check_button
+               image_selected="Checkbox_Slim_On"
+               image_unselected="Checkbox_Slim_Off"
+               image_pressed="Checkbox_Slim_Off"
+               image_pressed_selected="Checkbox_Slim_Off"/>
+          </check_box>
+          <text
+           follows="left|top"
+           font="SansSerif"
+           text_color="White"
+           height="12"
+           name="location_text"
+           top_pad="18"
+           width="120"
+           valign="center">
+           Start here
+          </text>
+          <icon
+           top_pad="6"
+           width="220"
+           height="28"
+           image_name="TextField_Active"
+           layout="topleft"
+           follows="left|top"
+           name="text_field_bg2" />
+          <combo_box
+           allow_text_entry="true"
+           control_name="NextLoginLocation"
+           follows="left|top"
+           label="My favorite places"
+           height="28"
+           max_chars="128"
+           combo_editor.font="SansSerifLarge"
+           top_delta="0"
+           name="start_location_combo"
+           width="220"
+           combo_button.scale_image="true">
+              <combo_box.combo_button
+               image_overlay="ComboButton_Arrow"
+               hover_glow_amount="0"
+               image_overlay_right_delta="10"
+               image_unselected="ComboButton_Transparent"
+               image_selected="ComboButton_Transparent"
+               image_disabled="ComboButton_Transparent" />
+              <combo_box.combo_editor
+               background_image="TextField_Transparent"
+               background_image_disabled="TextField_Transparent"
+               background_image_focused="TextField_Transparent"
+               draw_focus_border="false"
+               text_pad_left="8"
+               bg_image_always_focused="true"/>
+             <combo_box.item
+              label="My last location"
+              name="MyLastLocation"
+              value="last" />
+             <combo_box.item
+              label="My home"
+              name="MyHome"
+              value="home" />
+          </combo_box>
+          <layout_stack
+           follows="left|top"
+           layout="topleft"
+           orientation="vertical"
+           name="login_stack"
+           border_size="0"
+           animate="false"
+           top_pad="0"
+           left="0"
+           height="218"
+           width="300">
+            <layout_panel
+             auto_resize="false"
+             user_resize="false"
+             layout="topleft"
+             name="grid_panel"
+             background_visible="false"
+             height="64"
+             width="300">
+              <text
+               follows="left|top"
+               font="SansSerif"
+               text_color="white"
+               height="12"
+               name="grid_text"
+               top="18"
+               left="40"
+               width="120"
+               valign="center">
+               Grid
+              </text>
+              <combo_box
+               allow_text_entry="false"
+               font="SansSerifTiny"
+               follows="left|top"
+               height="28"
+               top_pad="6"
+               left="40"
+               max_chars="128"
+               label="Select grid"
+               layout="topleft"
+               name="server_combo"
+               width="220">
+                 <combo_box.drop_down_button
+                  pad_bottom="1"
+                  pad_left="10"
+                  font="SansSerif"
+                  label_color="Black"
+                  label_color_selected="Black"
+                  draw_focus_border="false"
+                  image_overlay="ComboButton_Arrow"
+                  image_overlay_right_delta="10"
+                  image_unselected="TextField_Active"
+                  image_selected="TextField_Active"
+                  image_pressed="TextField_Active"
+                  image_pressed_selected="TextField_Active"/>
+              </combo_box>
+            </layout_panel>
+            <layout_panel
+             auto_resize="false"
+             user_resize="false"
+             layout="topleft"
+             name="login_panel"
+             background_visible="false"
+             height="172"
+             width="300">
+              <button
+               follows="left|top"
+               image_unselected="PushButton_Login"
+               image_pressed="PushButton_Login_Pressed"
+               image_hover_unselected="PushButton_Login_Over"
+               label="Log in"
+               label_color="Black"
+               label_color_disabled="Black"
+               font="SansSerifLarge"
+               font.style="BOLD"
+               name="connect_btn"
+               draw_focus_border="false"
+               hover_hand_cursor="true"
+               enabled="true"
+               width="220"
+               height="30"
+               left="40"
+               top="25"
+               pad_bottom="1" />
+              <text
+               follows="left|top"
+               font="SansSerifMedium"
+               text_color="EmphasisColor"
+               height="15"
+               name="forgot_password_text"
+               left="60"
+               top_pad="9"
+               width="180"
+               halign="center">
+               Need help logging in?
+              </text>
+              <button
+               follows="left|top"
+               image_unselected="PushButton_Sign"
+               image_pressed="PushButton_Sign_Pressed"
+               image_hover_unselected="PushButton_Sign_Over"
+               label="Create account"
+               label_color="White"
+               label_color_disabled="Black"
+               font="SansSerifMedium"
+               font.style="BOLD"
+               name="sign_btn"
+               draw_focus_border="false"
+               hover_hand_cursor="true"
+               width="220"
+               height="35"
+               left="40"
+               top_pad="25"
+               pad_bottom="1" />
+            </layout_panel>
+          </layout_stack>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"
+         layout="topleft"
+         name="middle_gutter"
+         min_width="18"
+         max_width="18"
+         expanded_min_dim="18"
+         width="18"
+         height="768"
+         background_visible="true"
+         bg_opaque_color="DkGrayLogin"
+         background_opaque="true">
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"
+         layout="topleft"
+         name="web_container"
+         width="690"
+         height="768"
+         background_visible="true"
+         bg_opaque_color="DkGrayLogin"
+         background_opaque="true">
+          <web_browser
+            tab_stop="false"
+            trusted_content="true"
+            bg_opaque_color="DkGrayLogin"
+            border_visible="false"
+            follows="all"
+            left="0"
+            top="0"
+            right="-1"
+            bottom="-1"
+            name="login_html"
+            start_url="" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
     <layout_panel
-      auto_resize="false"
-      follows="left|right|top"
-      name="ui_container"
-      width="1011"
-      left="0"
-      top="0"
-      height="172">
-  <icon
-    height="73"
-    width="165"
-    image_name="login_mp_logo"
-    left="0"
-    top="25"
-    name="sl_logo_small" />
-  <combo_box
-    left_pad="22"
-    bottom_delta="-7"
-    allow_text_entry="true"
-    follows="left|top"
-    height="32"
-    label="Username"
-    combo_editor.font="SansSerifLarge"
-    max_chars="128"
-    combo_editor.commit_on_focus_lost="false"
-    combo_editor.prevalidator="ascii"
-    tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
-    name="username_combo"
-    width="206">
-    <combo_box.combo_editor
-      text_pad_left="8" 
-      bg_image_always_focused="true"/>
-  </combo_box>
-  <line_editor
-    follows="left|top"
-    height="32"
-    left_pad="15"
-    max_length_chars="16"
-    text_pad_left="8"
-    name="password_edit"
-    label="Password"
-  	bg_image_always_focused="true"
-    font="SansSerifLarge"
-    is_password="true"
-    select_on_focus="true"
-    commit_on_focus_lost="false"
-    bottom_delta="0"
-    width="165" />
-  <combo_box
-    allow_text_entry="true"
-    control_name="NextLoginLocation"    
-    follows="left|top"
-    label="My favorite places"
-    height="32"
-    max_chars="128"
-    combo_editor.font="SansSerifLarge"
-    left_pad="15"
-    bottom_delta="0"
-    name="start_location_combo"
-    width="175"
-    combo_button.scale_image="true">
-    <combo_box.combo_editor
-      bg_image_always_focused="true"
-      text_pad_left="8"/>
-    <combo_box.item
-      label="My last location"
-      name="MyLastLocation"
-      value="last" />
-    <combo_box.item
-      label="My home"
-      name="MyHome"
-      value="home" />     
-  </combo_box>
-  <button
-    follows="left|top"
-    image_unselected="PushButton_Login"
-    image_pressed="PushButton_Login_Pressed"
-    image_hover_unselected="PushButton_Login_Over"
-    label="Log In"
-    label_color="White"
-    font="SansSerifMedium"
-    name="connect_btn"
-    enabled="true"    
-    width="120"
-    height="32"
-  	left_pad="15"
-    bottom_delta="0" />
-  <text
-    follows="left|top"
-    font="SansSerifLarge"
-    font.style="BOLD"
-    text_color="EmphasisColor"
-    height="34"
-    name="sign_up_text"
-    left_pad="10"
-    width="200"
-    valign="center">
-    Sign up
-  </text>
-  <check_box
-    follows="left|top"
-    font="SansSerifMedium"
-    left="185"
-    bottom_delta="21"
-    height="24"
-    label="Remember me"
-    word_wrap="down"
-    check_button.bottom="3"
-    name="remember_name"
-    tool_tip="Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames."
-    width="198" />
-  <check_box
-    control_name="RememberPassword"
-    follows="left|top"
-    font="SansSerifMedium"
-    height="24"
-    left="408"
-    bottom_delta="0"
-    label="Remember password"
-    word_wrap="down"
-    check_button.bottom="3"
-    name="remember_password"
-    width="165" />
-  <combo_box
-    allow_text_entry="false"
-    font="SansSerifTiny"
-    follows="left|top"
-    height="26"
-  	left="588"
-  	bottom_delta="8"
-    max_chars="128"
-    label="Select grid"    
-    layout="topleft"
-    name="server_combo"
-    width="149" />
-  <text
-    follows="left|top"
-    font="SansSerifMedium"
-    text_color="EmphasisColor"
-    height="16"
-    name="forgot_password_text"
-    left="778"
-    bottom_delta="-8"
-    width="120"
-    halign="center">
-    Password help
-  </text>
-  </layout_panel>
-  <layout_panel
-      height="172"
-      auto_resize="true"
-      name="ui_elastic_pad_right"
-      width="32" />
+     auto_resize="true"
+     user_resize="false"
+     layout="topleft"
+     name="right_spacer"
+     background_visible="false"
+     min_width="0"
+     expanded_min_dim="0"
+     width="1">
+    </layout_panel>
   </layout_stack>
-  <web_browser
-    tab_stop="false"
-    trusted_content="true"
-    bg_opaque_color="Black"
-    border_visible="false"
-    follows="all"
-    left="0"
-    name="login_html"
-    start_url=""
-    top="154"
-    height="600"
-    width="1024" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
deleted file mode 100644
index d6ac71db94..0000000000
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel
-  follows="all"
-  height="768"
-  layout="topleft"
-  name="panel_login"
-  focus_root="true"
-  background_visible="true"
-  bg_opaque_color="0.16 0.16 0.16 1"
-  background_opaque="true"
-  width="1024">
-  <panel.string
-    name="forgot_password_url">
-    http://secondlife.com/account/request.php
-  </panel.string>
-  <panel.string
-    name="sign_up_url">
-    https://join.secondlife.com/
-  </panel.string>
-  <layout_stack
-    follows="left|right|top|bottom"
-    width="1024"
-    height="768"
-    left="0"
-    name="logo_stack"
-    orientation="vertical"
-    top="0">
-    <layout_panel
-      height="18"
-      auto_resize="false"
-      name="page_top"
-      width="1024" />
-    <!-- start of logo stack -->
-    <layout_panel
-      height="130"
-      min_height="10"
-      auto_resize="false"
-      name="parent_panel"
-      width="1024">
-      <layout_stack
-        follows="left|right|top|bottom"
-        height="100"
-        left="0"
-        name="logo_stack"
-        orientation="horizontal"
-        top="0"
-        width="1024">
-        <layout_panel
-          height="110"
-          min_height="10"
-          auto_resize="true"
-          name="logo_left"
-          width="300" />
-        <layout_panel
-          auto_resize="false"
-          follows="left|right|top"
-          name="logo_container"
-          width="225"
-          left="0"
-          top="0"
-          height="105">
-          <icon
-            height="94"
-            image_name="login_sl_logo"
-            left="0"
-            name="sl_logo"
-            top="0" />
-        </layout_panel>
-        <layout_panel
-          height="100"
-          name="logo_right"
-          auto_resize="true"
-          width="300" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of logo stack -->
-    <!-- start of widget stack -->
-    <layout_panel
-      height="100"
-      min_height="10"
-      auto_resize="false"
-      name="parent_panel2"
-      width="1024">
-      <layout_stack
-        follows="left|right|top|bottom"
-        height="80"
-        left="0"
-        name="widget_stack"
-        orientation="horizontal"
-        top="0"
-        width="1024">
-        <layout_panel
-          height="80"
-          min_height="10"
-          auto_resize="true"
-          name="widget_left"
-          width="200" />
-        <layout_panel
-          auto_resize="false"
-          follows="left|right|top"
-          name="widget_container"
-          width="730"
-          left="0"
-          top="0"
-          height="80">
-          <combo_box
-            allow_text_entry="true"
-            follows="left|bottom"
-            height="32"
-            left="42"
-            label="Username"
-            combo_editor.font="SansSerifLarge"
-            max_chars="128"
-            top="0"
-            combo_editor.prevalidator="ascii"
-            tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
-            name="username_combo"
-            width="232">
-            <combo_box.combo_editor
-                text_pad_left="8" />
-            <combo_box.combo_button
-                visible ="false"/>
-              <combo_box.drop_down_button
-                visible ="false"/>
-          </combo_box>
-          <line_editor
-            follows="left|top"
-            width="200"
-            height="32"
-            left="262"
-            max_length_chars="16"
-            name="password_edit"
-            label="Password"
-            text_pad_left="8"
-            font="SansSerifLarge"
-            is_password="true"
-            select_on_focus="true"
-            commit_on_focus_lost="false"
-            top="0" />
-          <button
-            follows="left|top"
-            image_unselected="PushButton_Login"
-            image_pressed="PushButton_Login_Pressed"
-            image_hover_unselected="PushButton_Login_Over"
-            label="Log In"
-            label_color="White"
-            font="SansSerifLarge"
-            name="connect_btn"
-  	        left_pad="15"
-            width="120"
-            height="32"
-            top="0" />
-          <text
-            follows="left|top"
-            font="SansSerifLarge"
-            font.style="BOLD"
-            text_color="EmphasisColor"
-            height="34"
-            name="sign_up_text"
-            left_pad="10"
-            top="0"
-            width="200"
-            valign="center">
-            Sign up
-          </text>
-          <check_box
-            follows="left|top"
-            font="SansSerifLarge"
-            left="42"
-            top="32"
-            height="24"
-            label="Remember me"
-            word_wrap="down"
-            check_button.bottom="3"
-            name="remember_name"
-            tool_tip="Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames."
-            width="198" />
-          <check_box
-            control_name="RememberPassword"
-            follows="left|top"
-            font="SansSerifLarge"
-            height="24"
-            left="262"
-            bottom_delta="0"
-            label="Remember password"
-            word_wrap="down"
-            check_button.bottom="3"
-            name="remember_password"
-            width="198" />
-          <text
-            follows="left|top"
-            font="SansSerifLarge"
-            text_color="EmphasisColor"
-            height="16"
-            name="forgot_password_text"
-            left="492"
-            top="34"
-            width="200">
-            Forgotten password
-          </text>
-        </layout_panel>
-        <layout_panel
-          height="100"
-          name="widget_right"
-          auto_resize="true"
-          width="200" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of widget stack -->
-    <!-- start of images stack -->
-    <layout_panel
-      height="500"
-      min_height="10"
-      auto_resize="false"
-      name="parent_panel3"
-      width="1024">
-      <layout_stack
-        follows="left|right|top|bottom"
-        height="500"
-        left="0"
-        name="images_stack"
-        orientation="horizontal"
-        top="0"
-        width="1024">
-        <layout_panel
-          height="500"
-          min_height="10"
-          auto_resize="true"
-          name="images_left"
-          width="96" />
-        <layout_panel
-          auto_resize="false"
-          follows="left|right|top"
-          name="images_container"
-          width="675"
-          left="0"
-          top="0"
-          height="500">
-          <icon
-            height="450"
-            width="675"
-            image_name="first_login_image"
-            left="0"
-            name="image_left"
-            top="0" />
-        </layout_panel>
-        <layout_panel
-          height="100"
-          name="images_right"
-          auto_resize="true"
-          width="96" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of images stack -->
-    <layout_panel
-      height="400"
-      min_height="10"
-      auto_resize="true"
-      name="page_bottom"
-      width="1024" />
-  </layout_stack>
-</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 95787c16c5..9cdbf68e72 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_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index 80db209b59..c6e2c124d1 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -63,7 +63,8 @@
                     use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_or_fee_box" visible="false">
                     Sender: "Resident R e s i d e n t R e s i d e n t"
                   </text>
-                  <text allow_scroll="false" font="SansSerifSmall" top="0" right="-5" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
+                  <!-- Old DejaVu font is used to avoid overlapping with sender name -->
+                  <text allow_scroll="false" font="DejaVu" font.size="LSmall" top="0" right="-5" width="100" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
                     name="notification_time" value="2014/12/24 23:30" />
                 </panel>
               </panel>
@@ -105,7 +106,8 @@
                         use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_or_fee_box_exp" visible="false">
                         Sender: "Resident R e s i d e n t R e s i d e n t"
                       </text>
-                      <text allow_scroll="false" font="SansSerifSmall" top="0" right="-1" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
+                      <!-- Old DejaVu font is used to avoid overlapping with sender name -->
+                      <text allow_scroll="false" font="DejaVu" font.size="LSmall" top="0" right="-1" width="100" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
                         name="notification_time_exp" value="2014/12/24 23:30" />
                     </panel>
                     <panel border="false" left="0" height="115" width="230" bevel_style="none" follows="all" layout="topleft" name="notification_text_panel_exp" visible="true">
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index dc8ac425b6..352eb790a3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -216,7 +216,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                     <button
                             follows="left|bottom"
                             height="22"
-                            image_pressed="PushButton_Press"
+                            image_pressed="PushButton_Selected"
                             image_pressed_selected="PushButton_Selected_Press"
                             image_selected="PushButton_Selected_Press"
                             is_toggle="true"
@@ -251,7 +251,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                             follows="bottom|right"
                             height="22"
                             image_overlay="Search_Icon"
-                            image_pressed="PushButton_Press"
+                            image_pressed="PushButton_Selected"
                             image_pressed_selected="PushButton_Selected_Press"
                             image_selected="PushButton_Selected_Press"
                             is_toggle="true"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 0766cc06ee..9657d80fc2 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -183,6 +183,7 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip
               increment="1"
               follows="left|top"
               left="5"
+              top_pad="5"
               min_val="0"
               max_val="4096"
               label="Range:"
@@ -199,13 +200,13 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip
          <layout_stack
            clip="false"
            follows="all"
-           height="410"
+           height="406"
            layout="topleft"
            left="0"
            mouse_opaque="false"
            orientation="vertical"
            right="-1"
-           top_pad="0">
+           top_pad="3">
            <layout_panel
              height="142"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 9f930d1557..1bea605d91 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -144,7 +144,7 @@
   <button
    follows="top|left"
    height="22"
-   image_pressed="PushButton_Press"
+   image_pressed="PushButton_Selected"
    image_pressed_selected="PushButton_Selected_Press"
    image_selected="PushButton_Selected_Press"
    label="Auto-adjust now"
@@ -157,7 +157,7 @@
   <button
    follows="top|left"
    height="22"
-   image_pressed="PushButton_Press"
+   image_pressed="PushButton_Selected"
    image_pressed_selected="PushButton_Selected_Press"
    image_selected="PushButton_Selected_Press"
    label="Cancel"
@@ -183,7 +183,7 @@
    follows="top|left"
    height="20"
    initial_value="true"
-   image_pressed="PushButton_Press"
+   image_pressed="PushButton_Selected"
    image_pressed_selected="PushButton_Selected_Press"
    image_selected="PushButton_Selected_Press"
    is_toggle="true"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index a412543251..07da9b4794 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -91,7 +91,7 @@
    layout="topleft"
    left_pad="40"
    name="fastest_lbl"
-   width="40">
+   width="42">
     Fastest
   </text>
   <radio_group
@@ -240,7 +240,7 @@
    left_pad="10"
    top_delta="1"
    name="farther_lbl"
-   width="40">
+   width="45">
     Farther
   </text>
   <text
@@ -284,7 +284,7 @@
    top_delta="0"
    left="160"
    name="enhancements_desc"
-   width="350">
+   width="375">
     Shadows significantly improve visual quality but can reduce speed.
   </text>
   <text
@@ -307,7 +307,8 @@
    left_delta="150"
    top_delta="0"
    name="ShadowDetail"
-   width="150">
+   width="153">
+    <combo_box.drop_down_button pad_right="20" />
     <combo_box.item
       label="None"
       name="0"
@@ -417,7 +418,7 @@
    top_delta="3"
    left_pad="10"
    name="photo_dist_det_desc"
-   width="180">
+   width="192">
       (Enter value between 0.0 and 4.0)
   </text>
   <text
@@ -426,7 +427,7 @@
    height="18"
    layout="topleft"
    top="80"
-   left="213"
+   left="215"
    name="0_lbl"
    width="7">
     0
@@ -446,7 +447,7 @@
    font="SansSerifSmall"
    height="18"
    layout="topleft"
-   left_pad="30"
+   left_pad="29"
    name="2_lbl"
    width="7">
     2
@@ -468,7 +469,7 @@
    layout="topleft"
    left_pad="30"
    name="4_lbl"
-   width="7">
+   width="8">
     4
   </text>
   <text
@@ -476,7 +477,7 @@
    font="SansSerifSmall"
    height="18"
    layout="topleft"
-   left_pad="30"
+   left_pad="29"
    name="5_lbl"
    width="7">
     5
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index b27b6dd73a..012c0bd0f7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,18 +13,6 @@
      name="aspect_ratio_text">
         [NUM]:[DEN]
     </panel.string>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="12"
-   layout="topleft"
-   left="33"
-   name="Cache:"
-   top_pad="10"
-   width="100">
-    Cache:
-  </text>
   <spinner
    control_name="CacheSize"
    decimal_digits="0"
@@ -33,9 +21,9 @@
    increment="64"
    initial_value="1024"
    label="Cache size (896 - 32768MB)"
-   label_width="150"
+   label_width="159"
    layout="topleft"
-   left="80"
+   left="33"
    max_val="32768"
    min_val="896"
    top_pad="10"
@@ -72,7 +60,7 @@
    follows="left|top"
    height="10"
    layout="topleft"
-   left="80"
+   left="33"
    name="Cache location"
    top_pad="5"
    width="300">
@@ -86,7 +74,7 @@
    font="SansSerif"
    height="23"
    layout="topleft"
-   left="80"
+   left="33"
    max_length_bytes="4096"
    name="cache_location"
    top_pad="5"
@@ -113,7 +101,7 @@
     left_pad="3"
     name="default_cache_location"
     top_delta="0"
-    width="100">
+    width="104">
     <button.commit_callback
      function="Pref.ResetCache" />
   </button>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 08b3ef69b6..6d1b952639 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -110,7 +110,8 @@
      left="255"
      max_chars="135"
      name="time_format_combobox"
-     width="70">
+     width="71">
+        <combo_box.drop_down_button pad_right="22" />
         <combo_box.item
          enabled="true"
          label="1:00 PM"
@@ -244,7 +245,7 @@
      height="20"
      layout="topleft"
      left="35"
-     top_pad="0" 
+     top_pad="5" 
      name="Name_Tag_Preference">
         <radio_item
          label="Off"
@@ -304,7 +305,7 @@
      name="display_names_check"
      width="100"
      tool_tip="Check to use display names in chat, IM, name tags, etc."
-     top_pad="3"/>
+     top_pad="5"/>
     <check_box
      control_name="NameTagShowFriends"
 	 enabled_control="AvatarNameTagMode"
@@ -319,7 +320,7 @@
      layout="topleft"
      control_name="GroupTitlesTagMode"
      enabled_control="AvatarNameTagMode"
-     left="39"
+     left="38"
      top_pad="3"
      name="group_title"
      width="130">
@@ -344,7 +345,7 @@
 	 layout="topleft"
 	 left="30"
 	 name="inworld_typing_rg_label"
-	 top_pad="4"
+	 top_pad="5"
 	 width="400">
        Pressing letter keys:
    </text>
@@ -353,7 +354,7 @@
      height="34"
      layout="topleft"
      left="35"
-     top_pad="0" 
+     top_pad="5" 
      name="inworld_typing_preference">
         <radio_item
          label="Starts local chat"
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 c78575cf82..8f13720f3e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -104,7 +104,7 @@
     layout="topleft"
     left="65"
     name="FasterText"
-    top_pad="4"
+    top_pad="10"
     width="80">
       Faster
   </text>
@@ -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"
@@ -216,7 +216,7 @@
     min_val="8"
     max_val="512"
     name="DrawDistance"
-    top_delta="40"
+    top_delta="34"
     width="427" />
   <text
     type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 1c00837073..8b60be30f9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -10,6 +10,7 @@
     top="1"
     width="517">
 
+  <!-- remove "hide_tabs" param when Discord tab is actually used -->
   <tab_container
     top_pad="0"
     enabled="true"
@@ -18,6 +19,7 @@
     width="517"
     left_delta="0"
     name="privacy_tab_container"
+    hide_tabs="true"
     tab_position="top"
     tab_stop="false">
   <panel
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 258c49785e..2036ed75ca 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -170,7 +170,7 @@
      left="30"
      name="Software updates:"
      mouse_opaque="false"
-     top_pad="5"
+     top_pad="8"
      width="300">
     Software updates:
   </text>
@@ -180,7 +180,7 @@
      height="23"
      layout="topleft"
      left_delta="50"
-     top_pad="5"
+     top_pad="10"
      name="updater_service_combobox"
      width="300">
         <combo_box.item
@@ -197,29 +197,29 @@
          value="0" />
   </combo_box>
   <check_box
-    top_delta="4"
+    top_pad="10"
     enabled="true"
     follows="left|top"
+    layout="topleft"
     height="14"
     control_name="UpdaterWillingToTest"
     label="Willing to update to Beta"
     left_delta="0"
     mouse_opaque="true"
     name="update_willing_to_test"
-    width="400"           
-    top_pad="5"/>
+    width="400"/>
   <check_box
-    top_delta="4"
+    top_pad="8"
     enabled="true"
     follows="left|top"
+    layout="topleft"
     height="14"
     control_name="UpdaterShowReleaseNotes"
     label="Show Release Notes after update"
     left_delta="0"
     mouse_opaque="true"
     name="update_show_release_notes"
-    width="400"
-    top_pad="5"/>
+    width="400"/>
   <text
      type="string"
      length="1"
@@ -229,7 +229,7 @@
      left="30"
      name="Proxy Settings:"
      mouse_opaque="false"
-     top_pad="5"
+     top_pad="8"
      width="300">
     Proxy Settings:
   </text>
@@ -242,8 +242,7 @@
     layout="topleft"
     left_delta="50"
     name="set_proxy"
-    top_pad="5"
-    >
+    top_pad="10" >
     <button.commit_callback
 		  function="Pref.Proxy" />
   </button>
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 52413abe74..af3b2d6cb5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -319,7 +319,7 @@
    top_delta="25"
    name="Listen media from"
    height="15"
-   width="165"
+   width="175"
    halign="right">
       Hear media and sounds from
   </text>
@@ -346,7 +346,7 @@
    layout="topleft"
    height="15"
    left="23"
-   width="165"
+   width="175"
    name="media_autoplay_label"
    halign="right">
     Auto-play media
@@ -357,7 +357,7 @@
         follows="left|top"
         layout="topleft"
         height="23"
-        left_delta="170"
+        left_delta="180"
         top_delta="-4"
         name="media_auto_play_combo"
         width="130">
@@ -379,7 +379,7 @@
         layout="topleft"
         height="15"
         left="23"
-        width="165"
+        width="175"
         name="media_firstinteract_label"
         halign="right">
             Media first-interact
@@ -390,11 +390,12 @@
     follows="left|top"
     layout="topleft"
     height="23"
-    left_delta="170"
+    left_delta="180"
     top_delta="-4"
     width="130"
     name="media_first_interact_combo"
     tool_tip="This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. Each option also inherits the previous ones.">
+        <combo_box.drop_down_button pad_right="19" />
         <item
             label="Disabled"
             name="media_first_click_none"
@@ -457,7 +458,7 @@
    layout="topleft"
    follows="left"
    height="15"
-   width="165"
+   width="175"
    name="noise_suppression_label"
    left="23"
    top_delta="22"
@@ -469,7 +470,7 @@
    enabled_control="EnableVoiceChat"
    follows="left|top"
    layout="topleft"
-   left_delta="170"
+   left_delta="180"
    top_delta="-6"
    width="130"
    height="23"
@@ -503,7 +504,7 @@
    left="23"
    top_delta="30"
    name="Listen from"
-   width="165"
+   width="175"
    height="15"
    halign="right">
      Hear voice from
@@ -513,7 +514,7 @@
    control_name="VoiceEarLocation"
    follows="left|top"
    layout="topleft"
-   left_delta="170"
+   left_delta="180"
    top_delta="-6"
    width="130"
    height="23"
@@ -603,7 +604,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/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
index 199dca4853..5e9ebabba7 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -13,7 +13,6 @@
    <panel.string
       name="trusted_estate_text">
 Any Experience may be Key.
-
 Key Experiences have permission to run on this estate.
 
 Additionally, if the estate does not allow public access, Residents participating in any Key Experience may enter the estate and can remain as long as they are in a Key Experience.
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 47e1e669d1..4e624276cc 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -67,12 +67,12 @@
     </text>
     <text
      follows="left|top"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="20"
      layout="topleft"
-     left_delta="50"
+     left_delta="53"
      name="version_channel_text"
-     top_delta="0"
+     top_delta="1"
      width="400">
         unknown
     </text>
@@ -81,7 +81,7 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     top_delta="0"
+     top_delta="-1"
      right="-100"
      name="grid_position_lbl"
      width="80">
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 73e0a1000f..dd9907dc1f 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -42,7 +42,7 @@
      max_val="100"
      name="water_height_spin"
      top="40"
-     width="180" />
+     width="190" />
     <spinner
      follows="left|top"
      height="20"
@@ -54,7 +54,7 @@
      max_val="100"
      name="terrain_raise_spin"
      top="40"
-     width="180" />
+     width="190" />
     <spinner
      follows="left|top"
      height="20"
@@ -67,7 +67,7 @@
      min_val="-100"
      name="terrain_lower_spin"
      top="60"
-     width="180" />
+     width="190" />
     <view_border
      bevel_style="none"
      follows="top|left"
@@ -330,7 +330,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="15"
      name="height_text_lbl7"
      top_delta="0"
      width="100">
@@ -349,7 +349,7 @@
       min_val="-500"
       name="height_start_spin_1"
       top_delta="15"
-      width="100" />  
+      width="105" />  
 <!--    northeast low-->
       <spinner
        follows="left|top"
@@ -363,7 +363,7 @@
        min_val="-500"
        name="height_start_spin_3"
        top_delta="0"
-       width="100" />
+       width="105" />
 <!--  northwest high-->
      <spinner
       follows="left|top"
@@ -377,7 +377,7 @@
       min_val="-500"
       name="height_range_spin_1"
       top_delta="20"
-      width="100" />
+      width="105" />
 <!--  northeast high-->
     <spinner
        follows="left|top"
@@ -391,7 +391,7 @@
        min_val="-500"
        name="height_range_spin_3"
        top_delta="0"
-       width="100" />
+       width="105" />
     <text
      follows="left|top"
      height="20"
@@ -406,7 +406,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="15"
      name="height_text_lbl9"
      top_delta="0"
      width="100">
@@ -425,7 +425,7 @@
      min_val="-500"
      name="height_start_spin_0"
      top_delta="15"
-     width="100" />
+     width="105" />
 <!--  southeast low-->
     <spinner
      follows="left|top"
@@ -439,7 +439,7 @@
      min_val="-500"
      name="height_start_spin_2"
      top_delta="0"
-     width="100" />
+     width="105" />
 <!--southwest high-->
     <spinner
      follows="left|top"
@@ -453,7 +453,7 @@
      min_val="-500"
      name="height_range_spin_0"
      top_delta="20"
-     width="100" />
+     width="105" />
 <!--  southeast high-->
     <spinner
      follows="left|top"
@@ -467,7 +467,7 @@
      min_val="-500"
      name="height_range_spin_2"
      top_delta="0"
-     width="100" />
+     width="105" />
 <!-- Terrain Download/Upload/Bake buttons -->
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index a29cdb5b41..bc5a64a209 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -166,7 +166,7 @@
                             layout="topleft"
                             left_delta="-5"
                             top_delta="25"
-                            width="80">
+                            width="90">
                         Moisture Level:
                     </text>
                      <slider
@@ -190,7 +190,7 @@
                             layout="topleft"
                             left_delta="-5"
                             top_delta="25"
-                            width="80">
+                            width="90">
                         Droplet Radius:
                     </text>
                     <slider
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c58cf97f3e..6045c58e21 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -91,7 +91,7 @@
      left="0" 
      name="balance"
      tool_tip="L$ [AMT]&#10;Click to refresh your L$ balance.&#10;Double-click to display or hide your L$ balance."
-     v_pad="4"
+     v_pad="2"
      top="0"
      wrap="false" 
      value="L$??" 
@@ -102,7 +102,7 @@
      follows="right|top|bottom"
      image_hover_unselected="PushButton_Over"
      image_unselected="PushButton_Off"
-     image_pressed="PushButton_Press"
+     image_pressed="PushButton_Selected"
      height="18"
      label="Buy L$"
      label_color="White"
@@ -122,7 +122,7 @@
      image_overlay_alignment="left"
      image_hover_unselected="PushButton_Over"
      image_unselected="PushButton_Off"
-     image_pressed="PushButton_Press"
+     image_pressed="PushButton_Selected"
      height="18"
      label="Shop"
      label_color="White"
@@ -140,7 +140,7 @@
      follows="right|top"
      halign="right"
      height="16"
-     top="5"
+     top="3"
      layout="topleft"
      left_pad="0"
      name="TimeText"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 1c70383bf9..5ff02de6f6 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -51,7 +51,9 @@
              name="color label"
              text_readonly_color="LabelDisabledColor"
              top="6"
-             width="64">
+             width="64"
+             font="DejaVu"
+             font.size="LSmall" >
                 Color
             </text>
             <!-- label is blank because control places it below the box -->
@@ -77,7 +79,9 @@
              name="color trans"
              text_readonly_color="LabelDisabledColor"
              top="6"
-             width="110">
+             width="110"
+             font="DejaVu"
+             font.size="LSmall" >
                 Transparency %
             </text>
             <spinner
@@ -91,7 +95,9 @@
              max_val="100"
              name="ColorTrans"
              top_pad="4"
-             width="80" />
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -102,7 +108,9 @@
              name="glow label"
              text_readonly_color="LabelDisabledColor"
              top="6"
-             width="80">
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" >
                 Glow
             </text>
             <spinner
@@ -114,7 +122,9 @@
              left_delta="0"
              name="glow"
              top_pad="4"
-             width="77" />
+             width="77"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Full Bright"
@@ -122,7 +132,9 @@
              left="7"
              name="checkbox fullbright"
              top_pad="4"
-             width="81" />
+             width="81"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              height="19"
              label="Hide water"
@@ -130,7 +142,9 @@
              left="172"
              top_delta="0"
              name="checkbox_hide_water"
-             width="81" />
+             width="81"
+             font="DejaVu"
+             font.size="LSmall" />
             <view_border
              bevel_style="none"
              follows="top|left"
@@ -139,7 +153,9 @@
              left="8"
              name="object_horizontal"
              top_pad="4"
-             width="278" />
+             width="278"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -149,7 +165,9 @@
              left="12"
              top_pad="12"
              name="label_matmedia"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall" >
                 Material
             </text>
             <combo_box
@@ -158,7 +176,9 @@
              left="10"
              name="combobox matmedia"
              top_pad="5"
-             width="90">
+             width="90"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Textures"
                  name="Materials"
@@ -179,7 +199,9 @@
             top_delta="-20"
             width="150"
             visible = "false"
-            name="radio_material_type">
+            name="radio_material_type"
+            font="DejaVu"
+            font.size="LSmall" >
                 <radio_item
                 label="Texture (diffuse)"
                 name="Texture (diffuse)"
@@ -209,7 +231,9 @@
             top_delta="0"
             width="150"
             visible = "false"
-            name="radio_pbr_type">
+            name="radio_pbr_type"
+            font="DejaVu"
+            font.size="LSmall" >
                 <radio_item
                 label="Complete material"
                 name="Complete material"
@@ -270,7 +294,9 @@
              name="checkbox_sync_settings"
              tool_tip="Adjust all maps repeats simultaneously"
              top_pad="19"
-             width="160" />
+             width="160"
+             font="DejaVu"
+             font.size="LSmall" />
             <texture_picker
              can_apply_immediately="true"
              allow_no_texture="true"
@@ -282,7 +308,9 @@
              name="pbr_control"
              tool_tip="Click to choose a pbr material"
              top_pad="5"
-             width="64" />
+             width="64"
+             caption_text.font="DejaVu"
+             caption_text.font.size="LSmall" />
             <button
              follows="left|top"
              height="23"
@@ -291,7 +319,9 @@
              top_delta="0"
              name="pbr_from_inventory"
              label="Choose from inventory"
-             width="140"/>
+             width="140"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              visible="false"
              type="string"
@@ -303,7 +333,9 @@
              left_delta="0"
              name="material_permissions_loading_label"
              text_readonly_color="LabelDisabledColor"
-             width="160">
+             width="160"
+             font="DejaVu"
+             font.size="LSmall" >
                 Loading contents...
             </text>
             <button
@@ -314,7 +346,9 @@
              top_delta="0"
              name="edit_selected_pbr"
              label="Edit Selected"
-             width="140"/>
+             width="140"
+             font="DejaVu"
+             font.size="LSmall" />
             <button
              follows="left|top"
              height="23"
@@ -323,7 +357,9 @@
              top_pad="4"
              name="save_selected_pbr"
              label="Save to inventory"
-             width="140"/>
+             width="140"
+             font="DejaVu"
+             font.size="LSmall" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -336,7 +372,9 @@
              name="texture control"
              tool_tip="Click to choose a picture"
              top_delta="-54"
-             width="64" />
+             width="64"
+             caption_text.font="DejaVu"
+             caption_text.font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -347,7 +385,9 @@
              name="label alphamode"
              text_readonly_color="LabelDisabledColor"
              top_delta="0"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall" >
                 Alpha mode
             </text>
             <combo_box
@@ -356,7 +396,9 @@
              left_delta="0"
              name="combobox alphamode"
              top_pad="4"
-             width="120">
+             width="120"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall">
                 <combo_box.item
                  label="None"
                  name="None"
@@ -384,7 +426,9 @@
              name="label maskcutoff"
              text_readonly_color="LabelDisabledColor"
              top_pad="4"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall" >
                 Mask cutoff
             </text>
             <spinner
@@ -399,7 +443,9 @@
              left_delta="0"
              increment="1"
              name="maskcutoff"
-             width="80" />
+             width="80"
+             font="DejaVu"
+             font.size="LSmall" />
             <texture_picker
              allow_no_texture="true"
              can_apply_immediately="true"
@@ -413,7 +459,9 @@
              name="bumpytexture control"
              tool_tip="Click to choose a picture"
              top_delta="-55"
-             width="64" />
+             width="64"
+             caption_text.font="DejaVu"
+             caption_text.font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -424,7 +472,9 @@
              name="label bumpiness"
              text_readonly_color="LabelDisabledColor"
              top_delta="0"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall" >
                 Bumpiness
             </text>
             <combo_box
@@ -433,7 +483,9 @@
              left_delta="0"
              name="combobox bumpiness"
              top_pad="4"
-             width="90">
+             width="90"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="None"
                  name="None"
@@ -527,7 +579,9 @@
              name="shinytexture control"
              tool_tip="Click to choose a picture"
              top_delta="-14"
-             width="64" />
+             width="64"
+             caption_text.font="DejaVu"
+             caption_text.font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -538,7 +592,9 @@
              left_pad="10"
              text_readonly_color="LabelDisabledColor"
              top_delta="4"
-             width="90">
+             width="90"
+             font="DejaVu"
+             font.size="LSmall" >
                 Shininess
             </text>
             <combo_box
@@ -547,7 +603,9 @@
              left_pad="10"
              name="combobox shininess"
              top_delta="-6"
-             width="90">
+             width="90"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="None"
                  name="None"
@@ -582,7 +640,9 @@
              name="label glossiness"
              text_readonly_color="LabelDisabledColor"
              top_pad="7"
-             width="116">
+             width="116"
+             font="DejaVu"
+             font.size="LSmall" >
                 Glossiness
             </text>
             <spinner
@@ -597,7 +657,9 @@
              top_delta="-4"
              left_pad="10"
              name="glossiness"
-             width="64" />
+             width="64"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -608,7 +670,9 @@
              name="label environment"
              text_readonly_color="LabelDisabledColor"
              top_pad="8"
-             width="116">
+             width="116"
+             font="DejaVu"
+             font.size="LSmall" >
                 Environment
             </text>
             <spinner
@@ -623,7 +687,9 @@
              top_delta="-4"
              left_pad="10"
              name="environment"
-             width="64" />
+             width="64"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -634,7 +700,9 @@
              name="label shinycolor"
              text_readonly_color="LabelDisabledColor"
              top_pad="8"
-             width="116">
+             width="116"
+             font="DejaVu"
+             font.size="LSmall" >
                 Color
             </text>
             <!-- label is blank because control places it below the box -->
@@ -658,7 +726,9 @@
              use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
-			 width="280">
+			 width="280"
+             font="DejaVu"
+             font.size="LSmall" >
 			 URL of chosen media, if any, goes here
 			 </text>
 			<button
@@ -670,7 +740,9 @@
 			 top_pad="4"
 			 tool_tip="Add Media"
 			 label="Choose..."
-			 width="85"/>
+			 width="85"
+             font="DejaVu"
+             font.size="LSmall" />
 			<button
 			 follows="top|left"
 			 height="18"
@@ -680,7 +752,9 @@
 			 tool_tip="Delete this media texture"
 			 top_delta="0"
 			 label="Remove"
-			 width="85"/>
+			 width="85"
+             font="DejaVu"
+             font.size="LSmall" />
             <button
 			 follows="left|top"
 			 height="18"
@@ -691,7 +765,9 @@
 			 name="button align"
 			 top_delta="0"
 			 tool_tip="Align media texture (must load first)"
-			 width="85" />
+			 width="85"
+             font="DejaVu"
+             font.size="LSmall" />
             <text
              type="string"
              length="1"
@@ -702,7 +778,9 @@
              name="tex gen"
              text_readonly_color="LabelDisabledColor"
              top_pad="46"
-             width="140">
+             width="140"
+             font="DejaVu"
+             font.size="LSmall" >
                 Mapping
             </text>
             <combo_box
@@ -711,7 +789,9 @@
              left_pad="0"
              name="combobox texgen"
              top_pad="-13"
-             width="125">
+             width="125"
+             drop_down_button.font="DejaVu"
+             drop_down_button.font.size="LSmall" >
                 <combo_box.item
                  label="Default"
                  name="Default"
@@ -733,7 +813,9 @@
              max_val="10000"
              name="TexScaleU"
              top_pad="5"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -745,7 +827,9 @@
              min_val="-10000"
              max_val="10000"
              name="TexScaleV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="1"
              follows="left|top"
@@ -758,7 +842,9 @@
              max_val="100"
              min_val="-100"
              name="rptctrl"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
            <spinner
              decimal_digits="2"
              follows="left|top"
@@ -772,7 +858,9 @@
              max_val="360"
              min_val="-360"
              name="TexRot"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -784,7 +872,9 @@
              min_val="-1"
              max_val="1"
              name="TexOffsetU"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -796,7 +886,9 @@
              min_val="-1"
              max_val="1"
              name="TexOffsetV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -809,7 +901,9 @@
              max_val="10000"
              name="bumpyScaleU"
              top_delta="-115"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -821,7 +915,9 @@
              min_val="-10000"
              max_val="10000"
              name="bumpyScaleV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
            <spinner
              decimal_digits="2"
              follows="left|top"
@@ -836,7 +932,9 @@
              max_val="360"
              min_val="-360"
              name="bumpyRot"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -848,7 +946,9 @@
              min_val="-1"
              max_val="1"
              name="bumpyOffsetU"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -860,7 +960,9 @@
              min_val="-1"
              max_val="1"
              name="bumpyOffsetV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -873,7 +975,9 @@
              max_val="10000"
              name="shinyScaleU"
              top_delta="-115"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -885,7 +989,9 @@
              min_val="-10000"
              max_val="10000"
              name="shinyScaleV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
            <spinner
              decimal_digits="2"
              follows="left|top"
@@ -900,7 +1006,9 @@
              max_val="360"
              min_val="-360"
              name="shinyRot"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -912,7 +1020,9 @@
              min_val="-1"
              max_val="1"
              name="shinyOffsetU"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -924,7 +1034,9 @@
              min_val="-1"
              max_val="1"
              name="shinyOffsetV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <check_box
              follows="top|left"
              height="16"
@@ -935,7 +1047,9 @@
              name="checkbox planar align"
              tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
              top_delta="20"
-             width="260" />
+             width="260"
+             font="DejaVu"
+             font.size="LSmall" />
 			<button
              follows="left|top"
              layout="topleft"
@@ -946,7 +1060,9 @@
 			 label_selected="Align current texture layers"
 			 name="button align textures"
 			 tool_tip="Align current texture layers"
-			 width="66" />
+			 width="66"
+             font="DejaVu"
+             font.size="LSmall" />
             <web_browser
              visible="false"
              enabled="false"
@@ -972,7 +1088,9 @@
              max_val="10000"
              name="gltfTextureScaleU"
              top_delta="34"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -984,7 +1102,9 @@
              min_val="-10000"
              max_val="10000"
              name="gltfTextureScaleV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              decimal_digits="1"
              follows="left|top"
@@ -997,7 +1117,9 @@
              max_val="100"
              min_val="-100"
              name="gltfRptctrl"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1009,7 +1131,9 @@
              min_val="-360"
              max_val="360"
              name="gltfTextureRotation"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1021,7 +1145,9 @@
              min_val="-999"
              max_val="999"
              name="gltfTextureOffsetU"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <spinner
              follows="left|top"
              height="19"
@@ -1033,6 +1159,8 @@
              min_val="-999"
              max_val="999"
              name="gltfTextureOffsetV"
-             width="265" />
+             width="265"
+             font="DejaVu"
+             font.size="LSmall" />
             <!-- END PBR Material texture transform parameters -->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 3e9efb6f8b..c067c86ba7 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -29,7 +29,7 @@ width="333">
    background_visible="false"
    bg_opaque_color="DkGray2"
    left="10"
-   top="5"
+   top="0"
    follows="left|top|right"
    layout="topleft"
    width="307"
@@ -50,25 +50,15 @@ 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"
-      top="3"
+      left="5"
+      top="0"
       mouse_opaque="false"
       name="currentlook_status" >
       (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/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 63369431b1..6e48577064 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -117,6 +117,8 @@ Voice Server Version: [VOICE_VERSION]
 	
 	<string name="AgniGridLabel">Second Life Main Grid (Agni)</string>
 	<string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string>
+    <string name="AgniGridLabelShort">Agni (production)</string>
+    <string name="AditiGridLabelShort">Aditi (beta)</string>
 	
 	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
 	<string name="LoginFailedViewerNotPermitted">
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 090447a6a2..c7669e81af 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"
@@ -21,9 +21,10 @@
         font="SansSerifSmall"
         hover_glow_amount="0.15"
         halign="center"
-        pad_bottom="1"
+        pad_bottom="2"
         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/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index cf995e5833..ebe2fa07e2 100644
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -9,7 +9,7 @@
   left_pad="0"
   icon_pad="10"
   icon_width="20"
-  text_pad="7"
+  text_pad="5"
   text_pad_right="4"
   arrow_size="12"
   max_folder_item_overlap="2"
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 604f62b099..3a0f43de3d 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/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 11758556d6..73c6dc5d7a 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -9,7 +9,9 @@
  bg_alpha_image="Window_Background" 
  background_visible="true"
  background_opaque="false"
+ header_font="SansSerif"
  header_height="25"
+ header_vpad="5"
  close_image="Icon_Close_Foreground"
  restore_image="Icon_Restore_Foreground"
  minimize_image="Icon_Minimize_Foreground"
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 50c5285e04..671cb37ca3 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
@@ -3,16 +3,21 @@
   folder_arrow_image="Folder_Arrow"
   favorite_image="Inv_Favorite_Star_Full"
   favorite_content_image="Inv_Favorite_Star_Content"
-  folder_indentation="8"
-  item_height="20" 
+  folder_indentation="10"
+  item_height="21" 
   item_top_pad="4"
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
   left_pad="5"
-  icon_pad="2"
+  icon_pad="4"
   icon_width="16"
-  text_pad="1"
+  text_pad="5"
   text_pad_right="4"
+  text_pad_top="0"
   arrow_size="12"
   max_folder_item_overlap="2"/>
+
+<!-- Potential properties not included above:
+  arrow_pad_top
+-->
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
index 14cd3e159c..499152f060 100644
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
@@ -10,7 +10,7 @@
      mouse_opaque="false"
      scale_image="true"
      image_selected="PushButton_Selected_Press"
-     image_pressed="PushButton_Press"
+     image_pressed="PushButton_Selected"
      image_pressed_selected="PushButton_Selected_Press"
      image_unselected="PushButton_Off"
      image_disabled="PushButton_Disabled"
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 865c145022..41ef9d2b8a 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 09cbb1d3ab..ad4249da4e 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 ce36a39a21..b00b8a241b 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/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index ae642e1da5..cf6dc0a8c0 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -11,7 +11,7 @@
 			 text_pad_left="2"
              text_readonly_color="TextFgReadOnlyColor"
              text_tentative_color="TextFgTentativeColor"
-			 highlight_color="EmphasisColor"
+			 highlight_color="SelectionColor"
 			 preedit_bg_color="White"
              mouse_opaque="true"
              name="line_editor"
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 51144c92b6..8294b96799 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 b99010e17a..041470d0d2 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,12 +15,12 @@
   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"
   bg_readonly_color="TextBgReadOnlyColor"
   bg_writeable_color="TextBgWriteableColor"
-  bg_selected_color="EmphasisColor"
+  bg_selected_color="SelectionColor"
   bg_focus_color="TextBgFocusColor">
 </simple_text_editor>
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 f565161794..311535de06 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -6,10 +6,11 @@ label_pad_left - padding to the left of tab button labels
 <tab_container name="tab_container" 
                mouse_opaque="false"
                tab_min_width="60"
-               tab_max_width="150"
+               tab_max_width="160"
                use_custom_icon_ctrl="false"
                halign="center"
-               font="SansSerifSmall" 
+               font="SansSerif"
+               font.size="Small"
                tab_height="22"
                label_pad_bottom="1"
                label_pad_left="4">
@@ -19,22 +20,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/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 51852dd6dd..33b431c6e5 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -15,7 +15,7 @@
   <button_icon_and_text imgoverlay_label_space="7"
                         label_color_selected="White"
                         halign="left"
-                        image_pressed="PushButton_Press"
+                        image_pressed="PushButton_Selected"
                         image_pressed_selected="PushButton_Selected_Press"
                         image_selected="PushButton_Selected_Press"
                         image_disabled_selected="PushButton_Selected_Disabled"
@@ -25,6 +25,7 @@
                         desired_height="24"
                         pad_left="10" 
                         pad_right="10"
+                        pad_bottom="1"
                         follows="left|top"
                         chrome="true"
                         image_overlay_alignment="left"
@@ -37,7 +38,7 @@
                pad_right="10"
                image_bottom_pad="10"
                image_top_pad="10"
-               image_pressed="PushButton_Press"
+               image_pressed="PushButton_Selected"
                image_pressed_selected="PushButton_Selected_Press"
                image_selected="PushButton_Selected_Press"
                image_disabled_selected="PushButton_Selected_Disabled"
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 aa235e103b..64be14a69c 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"
@@ -29,14 +29,14 @@
     width="16" />
   <item_name
     follows="left|right"
-    height="20"
+    height="21"
     layout="topleft"
     left="21"
     parse_urls="false"
     use_ellipses="true"
     name="item_name"
     text_color="white"
-    top="4"
+    top="1"
     value="..."
     width="359" />
     <add_btn
diff --git a/indra/newview/skins/default/xui/es/panel_login_first.xml b/indra/newview/skins/default/xui/es/panel_login_first.xml
deleted file mode 100644
index ccb6858351..0000000000
--- a/indra/newview/skins/default/xui/es/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=es
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Nombre de usuario" name="username_combo" tool_tip="El nombre de usuario que elegiste al registrarte, como bobsmith12 o Steller Sunshine"/>
-					<line_editor label="Contraseña" name="password_edit"/>
-					<button label="Iniciar sesión" name="connect_btn"/>
-					<check_box label="Recordarme" name="remember_check"/>
-					<text name="forgot_password_text">
-						Contraseña olvidada
-					</text>
-					<text name="sign_up_text">
-						Regístrate
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Tu primer destino es la Isla de aprendizaje. ¡Encuentra el portal de salida!
-					</text>
-					<text name="image_caption_right">
-						A continuación, puedes explorar la Isla social y hablar con otros residentes nuevos.
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_login_first.xml b/indra/newview/skins/default/xui/fr/panel_login_first.xml
deleted file mode 100644
index 8f40d0230c..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=fr
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Nom d&apos;utilisateur" name="username_combo" tool_tip="Nom d&apos;utilisateur que vous avez choisi lors de votre inscription (par exemple, bobsmith12 ou Steller Sunshine)."/>
-					<line_editor label="Mot de passe" name="password_edit"/>
-					<button label="Connexion" name="connect_btn"/>
-					<check_box font="SansSerifSmall" label="Mémoriser mes informations" name="remember_check"/>
-					<text name="forgot_password_text">
-						Mot de passe oublié
-					</text>
-					<text name="sign_up_text">
-						S&apos;inscrire
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Votre première étape est Learning Island. Trouvez le portail de sortie.
-					</text>
-					<text name="image_caption_right">
-						Puis explorez Social Island et faites la connaissance d&apos;autres résidents.
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_login_first.xml b/indra/newview/skins/default/xui/it/panel_login_first.xml
deleted file mode 100644
index 5b04fd411a..0000000000
--- a/indra/newview/skins/default/xui/it/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=it
-	</panel.string>
-	<panel.string name="sign_up_url">
-		http://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Nome utente" name="username_combo" tool_tip="Il nome utente che hai scelto durante la registrazione, come roby12 o Stella Solare"/>
-					<line_editor label="Password" name="password_edit"/>
-					<button label="Accedi" name="connect_btn"/>
-					<check_box label="Ricordami" name="remember_check"/>
-					<text name="forgot_password_text">
-						Password dimenticata
-					</text>
-					<text name="sign_up_text">
-						Registrati
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Il primo passo è a Learning Island. Trova il portale di uscita!
-					</text>
-					<text name="image_caption_right">
-						Quindi esplora Social Island e incontra altri nuovi residenti.
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml
index 2085e916c8..874f530f17 100644
--- a/indra/newview/skins/default/xui/ja/fonts.xml
+++ b/indra/newview/skins/default/xui/ja/fonts.xml
@@ -2,11 +2,11 @@
 <fonts>
 	<font name="default" comment="default font files (global fallbacks)">
 		<file>
-			NotoSansCJKjp-Medium.otf
-		</file>
-		<file>
-			DejaVuSans.ttf
+			NotoSansCJKjp-SemiBold.otf
 		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 		<os name="Windows">
 			<file load_collection="true">
 				YuGothM.ttc
@@ -41,7 +41,7 @@
 		</os>
 		<os name="Mac">
 			<file>
-				YuGothic-Medium.otf
+				YuGothic-SemiBold.otf
 			</file>
 			<file>
 				ヒラギノ角ゴシック W3.ttc
@@ -82,9 +82,9 @@
 		<file>
 			NotoSansCJKjp-Bold.otf
 		</file>
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 		<os name="Windows">
 			<file load_collection="true">
 				YuGothB.ttc
@@ -106,9 +106,9 @@
 		<file>
 			NotoSansCJKjp-Bold.otf
 		</file>
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arial.ttf
@@ -121,19 +121,19 @@
 		</os>
 	</font>
 	<font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 	</font>
 	<font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
-		<file>
-			DejaVuSans-Oblique.ttf
-		</file>
+        <file load_collection="true">
+            Inter_18pt-Italic.ttf
+        </file>
 	</font>
 	<font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
-		<file>
-			DejaVuSans-BoldOblique.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBoldItalic.ttf
+        </file>
 	</font>
 	<font name="Monospace" comment="Name of monospace font">
 		<file>
@@ -144,29 +144,29 @@
 		</file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font">
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="force_auto" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
-		<file>
-			DejaVuSans-Oblique.ttf
-		</file>
+        <file load_collection="true">
+            Inter_18pt-Italic.ttf
+        </file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
-		<file>
-			DejaVuSans-BoldOblique.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBoldItalic.ttf
+        </file>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font">
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arial.ttf
@@ -179,9 +179,9 @@
 		</os>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arialbd.ttf
@@ -194,9 +194,9 @@
 		</os>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
-		<file>
-			DejaVuSans-Oblique.ttf
-		</file>
+        <file load_collection="true">
+            Inter_18pt-Italic.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				ariali.ttf
@@ -209,9 +209,9 @@
 		</os>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
-		<file>
-			DejaVuSans-BoldOblique.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBoldItalic.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arialbi.ttf
@@ -227,13 +227,13 @@
 		<file>
 			times.ttf
 		</file>
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 	</font>
 	<font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0"/>
 	<font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0"/>
-	<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6"/>
-	<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6"/>
-	<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6"/>
+	<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="11"/>
+	<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="9"/>
+	<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="8"/>
 </fonts>
diff --git a/indra/newview/skins/default/xui/ja/panel_login_first.xml b/indra/newview/skins/default/xui/ja/panel_login_first.xml
deleted file mode 100644
index 0f987fc816..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_login_first.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		https://secondlife.com/my/account/request.php?lang=ja-JP
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/?lang=ja
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="page_top"/>
-		<layout_panel name="parent_panel">
-			<layout_stack name="logo_stack">
-				<layout_panel name="logo_left"/>
-				<layout_panel name="logo_container">
-					<icon name="sl_logo"/>
-				</layout_panel>
-				<layout_panel auto_resize="true"/>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_left"/>
-				<layout_panel name="widget_container">
-					<combo_box label="ユーザ名" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
-						<combo_box.combo_editor/>
-						<combo_box.combo_button/>
-						<combo_box.drop_down_button/>
-					</combo_box>
-					<line_editor name="password_edit" label="パスワード"/>
-					<button label="ログイン" name="connect_btn"/>
-					<text name="sign_up_text" valign="center">
-						サインアップ
-					</text>
-					<check_box label="ユーザ名を記憶" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。"/>
-					<check_box label="パスワード記憶" name="remember_password"/>
-					<text name="forgot_password_text">
-						パスワードを忘れましたか？
-					</text>
-				</layout_panel>
-				<layout_panel name="widget_right"/>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_left"/>
-				<layout_panel name="images_container">
-					<icon name="image_left"/>
-				</layout_panel>
-				<layout_panel name="images_right"/>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="page_bottom"/>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_login_first.xml b/indra/newview/skins/default/xui/pl/panel_login_first.xml
deleted file mode 100644
index 0604ecbcff..0000000000
--- a/indra/newview/skins/default/xui/pl/panel_login_first.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_login">
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Użytkownik" tool_tip="Nazwa użytkownika wybrana przy rejestracji, np. bobsmith12 lub Steller Sunshine" name="username_combo" />
-					<line_editor name="password_edit" label="Hasło" />
-					<button label="Zaloguj" name="connect_btn" />
-					<check_box label="Zapamiętaj mnie" name="remember_check" />
-					<text name="forgot_password_text">
-						Zapomniałem/am hasła
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Wyspa Nauki to Twój pierwszy krok. Znajdź portal z wyjściem!
-					</text>
-					<text name="image_caption_right">
-						Potem zwiedź Wyspę Towarzyską i poznaj innych nowych rezydentów!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_login_first.xml b/indra/newview/skins/default/xui/pt/panel_login_first.xml
deleted file mode 100644
index 86c61163bc..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=pt
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Nome de usuário" name="username_combo" tool_tip="O nome de usuário que você escolheu ao fazer seu cadastro, como zecazc12 ou Magia Solar"/>
-					<line_editor label="Senha" name="password_edit"/>
-					<button label="Login" name="connect_btn"/>
-					<check_box label="Lembrar-me" name="remember_check"/>
-					<text name="forgot_password_text">
-						Senha esquecida
-					</text>
-					<text name="sign_up_text">
-						Cadastre-se
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Sua primeira parada é a Ilha da Educação. Encontre o portal de saída!
-					</text>
-					<text name="image_caption_right">
-						Em seguida, explore a Ilha Social e encontre novos residentes!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_login_first.xml b/indra/newview/skins/default/xui/ru/panel_login_first.xml
deleted file mode 100644
index 5db81ea7ca..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Имя пользователя" name="username_combo" tool_tip="Имя пользователя, которое вы выбрали при регистрации, например, «bobsmith12» или «Steller Sunshine»"/>
-					<line_editor label="Пароль" name="password_edit"/>
-					<button label="Войти" name="connect_btn"/>
-					<check_box label="Запомнить меня" name="remember_check"/>
-					<text name="forgot_password_text">
-						Забытый пароль
-					</text>
-					<text name="sign_up_text">
-						Регистрация
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Ваш первый шаг – Учебный остров. Найдите портал выхода!
-					</text>
-					<text name="image_caption_right">
-						Затем исследуйте Социальный остров и познакомьтесь с другими новичками!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_login_first.xml b/indra/newview/skins/default/xui/tr/panel_login_first.xml
deleted file mode 100644
index 1fc80c2b97..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="Kullanıcı Adı" name="username_combo" tool_tip="Kaydolduğunuzda seçtiğiniz kullanıcı adı, örn. mustafayalcin12 veya Faruk Gungoren"/>
-					<line_editor label="Parola" name="password_edit"/>
-					<button label="Oturum Aç" name="connect_btn"/>
-					<check_box label="Beni hatırla" name="remember_check"/>
-					<text name="forgot_password_text">
-						Parolamı unuttum
-					</text>
-					<text name="sign_up_text">
-						Kaydol
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						Başlangıç yeriniz Eğitim Adası. Haydi çıkış portalını bulun!
-					</text>
-					<text name="image_caption_right">
-						Sonra da Sosyal Ada&apos;yı keşfe çıkın ve diğer LS sakinleriyle tanışın!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_login_first.xml b/indra/newview/skins/default/xui/zh/panel_login_first.xml
deleted file mode 100644
index 4d72fcdd03..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_login_first.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php
-	</panel.string>
-	<panel.string name="sign_up_url">
-		http://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="使用者名稱" name="username_combo" tool_tip="使用者名稱是你註冊時所挑選的，例如 bobsmith12 或 Steller Sunshine"/>
-					<line_editor label="密碼" name="password_edit"/>
-					<button label="登入" name="connect_btn"/>
-					<check_box label="記得我" name="remember_check"/>
-					<text name="forgot_password_text">
-						忘記密碼
-					</text>
-					<text name="sign_up_text">
-						註冊
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						你在「學習島」的第一步。 找到離開的傳送門！
-					</text>
-					<text name="image_caption_right">
-						接著，到「社交島」探索，認識新的居民朋友！
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 94cf0fcf10..1cbb8b50eb 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -236,7 +236,7 @@ namespace tut
                       std::string("https://secondlife.com/helpers/"));
         ensure_equals("Agni login page",
                       LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
-                      std::string("https://viewer-splash.secondlife.com/"));
+                      std::string("https://viewer-splash-v2.secondlife.com/"));
         ensure("Agni is a system grid",
                LLGridManager::getInstance()->isSystemGrid("util.agni.lindenlab.com"));
 
@@ -261,7 +261,7 @@ namespace tut
                       std::string("https://secondlife.aditi.lindenlab.com/helpers/"));
         ensure_equals("Aditi login page",
                       LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
-                      std::string("https://viewer-splash.secondlife.com/"));
+                      std::string("https://viewer-splash-v2.secondlife.com/"));
         ensure("Aditi is a system grid",
                LLGridManager::getInstance()->isSystemGrid("util.aditi.lindenlab.com"));
     }
@@ -309,7 +309,7 @@ namespace tut
                       std::string("https://secondlife.com/helpers/"));
         ensure_equals("Agni login page",
                       LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
-                      std::string("https://viewer-splash.secondlife.com/"));
+                      std::string("https://viewer-splash-v2.secondlife.com/"));
         ensure("Agni is a system grid",
                LLGridManager::getInstance()->isSystemGrid("util.agni.lindenlab.com"));
 
@@ -333,7 +333,7 @@ namespace tut
                       std::string("https://secondlife.aditi.lindenlab.com/helpers/"));
         ensure_equals("Aditi login page",
                       LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
-                      std::string("https://viewer-splash.secondlife.com/"));
+                      std::string("https://viewer-splash-v2.secondlife.com/"));
         ensure("Aditi is a system grid",
                LLGridManager::getInstance()->isSystemGrid("util.aditi.lindenlab.com"));
 
@@ -422,7 +422,7 @@ namespace tut
                       std::string("https://secondlife.com/helpers/"));
         ensure_equals("getLoginPage",
                       LLGridManager::getInstance()->getLoginPage(),
-                      std::string("https://viewer-splash.secondlife.com/"));
+                      std::string("https://viewer-splash-v2.secondlife.com/"));
         ensure_equals("update url base for Agni", // relies on agni being the default
                       std::string("https://update.secondlife.com/update"),
                       LLGridManager::getInstance()->getUpdateServiceURL());
author	Erik Kundiman <erik@megapahit.org>	2026-04-19 08:50:43 +0800
committer	Erik Kundiman <erik@megapahit.org>	2026-04-19 08:51:40 +0800
commit	badf783df47cb08de85a7abfa612ce813628058d (patch)
tree	f083ba78912ff61645706d14060b6fe37f91b458 /indra
parent	7d73db9236774e45240602395f544e19ac10bef7 (diff)
parent	8ffb73b4c0f5141d03cbbdfa8213421effed8eb0 (diff)