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 6f9038df626c6cbc5b95b24002a516031b21105f..66c207603b81e7f8bca8797ae271305b73b30f82 100644
--- a/indra/newview/skins/default/xui/en/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/en/floater_font_test.xml
@@ -199,7 +199,7 @@
bottom_delta="20"
follows="left|top|right"
font="SansSerif"
- font_shadow="hard"
+ font_shadow="none"
height="16"
layout="topleft"
left="16">
diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
index 2029b19c1c82998958720bcefe284f209bde8e33..e83d07baecf1feda9047be131906a89e377de74d 100644
--- a/indra/newview/skins/default/xui/en/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_group_plus"
left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
<menu_item_call name="item_join" label="Join Group...">
<menu_item_call.on_click function="People.Group.Plus.Action" userdata="join_group" />
</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index 6ef1eb9513f87fe432f733c8691a937ee025fdc1..3c7b6dad14a5866123775bb11370379aa2a96ae6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_group_plus"
left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
<menu_item_call name="sort_name" label="Sort by Name">
<menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_name" />
</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
index ec8582f5b5fccca10ffea4e0b9fae5b4f5f99c4a..2bec7454109abf50045498fa869c9775ff9f6d42 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_group_plus"
left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
<menu_item_check
label="Display Group Icons"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index 2b0f029016b053bd2cbfd0fa316d76d9155309e2..f91a9613886e57546bee93e13ced298e0d202ba6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_group_plus"
left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
<menu_item_call name="sort_recent" label="Sort by Recent Speakers">
<menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_recent" />
</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index d9606de90de4dc5e574bf7ca46a5b111c83c7cc5..ed03cd467c54a833ffe05604f5421dd330496365 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_group_plus"
left="0" bottom="0" visible="false"
- mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true">
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
<menu_item_call name="sort_most" label="Sort by Most Recent">
<menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_recent" />
</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 833001b34b1e7127f939ad5ad18245ec82703596..91c19badfaa60186cc3012fb933264190ccb278f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4418,7 +4418,7 @@ Are you sure you want to delete your travel, web, and search history?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
- yestext="Yes"/>
+ yestext="OK"/>
</notification>
<notification
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index f97daf922f08a11b0de9faa591ccdd8135e7bb7c..deea0a44abd5daf4f4bacdf51f26b8dd9b896ebd 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -65,7 +65,7 @@
follows="left|bottom|right" height="15" width="15"
layout="topleft" bottom="122" left="25" mouse_opaque="true" name="attachment_icon" visible="true"
/>
- <text font="SansSerif" font.style="UNDERLINE" font_shadow="hard"
+ <text font="SansSerif" font.style="UNDERLINE" font_shadow="none"
type="string" length="1" follows="left|bottom|right" layout="topleft"
left="45" bottom="122" height="15" width="280" name="attachment"
text_color="GroupNotifyTextColor" visible="true">