diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
index 82bf5fc8da..54dbc698c8 100755
--- a/indra/newview/skins/default/xui/en/alert_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -4,7 +4,7 @@
   revert_on_esc="true"
   commit_on_focus_lost="true"
   ignore_tab="true"
-  max_length="254"
+  max_length_bytes="254"
   text_pad_right="0"
   text_pad_left="2"
   mouse_opaque="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index a21f069885..8f06cdc293 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -57,7 +57,7 @@
      height="16"
      layout="topleft"
      left_delta="78"
-     max_length_chars="63"
+     max_length_bytes="63"
      name="LabelItemName"
      top_delta="0"
      width="252" />
@@ -80,7 +80,7 @@
      height="16"
      layout="topleft"
      left_delta="78"
-     max_length_chars="127"
+     max_length_bytes="127"
      name="LabelItemDesc"
      top_delta="0"
      width="252" />
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index 7ce642b7b2..16d3facaef 100755
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -30,7 +30,6 @@
     </text>
     <panel_inventory_object
      background_visible="false"
-     draw_border="false"
      follows="all"
      height="276"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 8a89ce6856..20aab9c1fc 100755
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -84,7 +84,7 @@
      top_pad="0"
      layout="topleft"
      left="130"
-     max_length="9"
+     max_length_bytes="9"
      name="amount"
      width="80" />
 	<text
@@ -104,7 +104,7 @@
      top_pad="0"
      layout="topleft"
      left="35"
-     max_length="9"
+     max_length_bytes="127"
      name="payment_message"
      width="175" />
     <button
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index d8cfed7b09..d3a35c2051 100755
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -117,7 +117,7 @@
      top_pad="0"
      layout="topleft"
      left="120"
-     max_length="9"
+     max_length_bytes="9"
      name="amount"
      width="80" />
     <button
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
index 6e11f80879..f7a500ae09 100755
--- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
@@ -18,15 +18,7 @@
     left="5"
     height="25"
     width="25"
-    visible="false"
-    speaker.name="speaker_p2p"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
+    visible="false">
   </chiclet_script>
   <chiclet_offer
     name="inv_offer_chiclet"
@@ -36,15 +28,7 @@
     left="5"
     height="25"
     width="25"
-    visible="false"
-    speaker.name="speaker_p2p"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
+    visible="false">
   </chiclet_offer>
 	<text
     type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 27c653bc35..432821912d 100755
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -32,7 +32,6 @@
      width="308"/>
     <texture_picker
      allow_no_texture="true"
-     border_enabled="true"
      fallback_image="default_land_picture.j2c"
      enabled="false"
      follows="left|top"
@@ -67,8 +66,7 @@
      textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
-     width="178"
-     word_wrap="true" />
+     width="178"/>
     <button
      follows="right"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
index 417e89de99..d10e2552fc 100755
--- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
@@ -45,7 +45,6 @@
      parse_urls="true"/>
     <text_editor
 	 border_visible="true"
-	 bevel_style="in"
      parse_urls="true"
      enabled="true"
      follows="all"
@@ -61,8 +60,7 @@
      use_ellipses="true"
      value="message"
      width="285"
-     word_wrap="true"
-     parse_url="false" >
+     word_wrap="true">
     </text_editor>
   </panel>
   <panel
diff --git a/indra/newview/skins/starlight/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/starlight/xui/en/panel_classifieds_list_item.xml
index 033377e837..a0d1911e69 100644
--- a/indra/newview/skins/starlight/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_classifieds_list_item.xml
@@ -32,7 +32,6 @@
      width="308"/>
     <texture_picker
      allow_no_texture="true"
-     border_enabled="true"
      fallback_image="default_land_picture.j2c"
      enabled="false"
      follows="left|top"
@@ -55,8 +54,7 @@
      text_color="White"
      top="9"
      use_ellipses="true"
-     width="193"
-     word_wrap="false" />
+     width="193"/>
     <expandable_text
      follows="top|left|right"
      font="SansSerifSmall"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/starlightcui/xui/en/panel_classifieds_list_item.xml
index 033377e837..11b3fc073a 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_classifieds_list_item.xml
@@ -32,7 +32,6 @@
      width="308"/>
     <texture_picker
      allow_no_texture="true"
-     border_enabled="true"
      fallback_image="default_land_picture.j2c"
      enabled="false"
      follows="left|top"
@@ -68,7 +67,6 @@
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
-     word_wrap="true"
      expanded_bg_visible="true"
      expanded_bg_color="SL-Background_Light"/>
     <button
diff --git a/indra/newview/skins/vintage/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/vintage/xui/en/floater_inventory_item_properties.xml
index 52d8167aa4..a72b0b8654 100644
--- a/indra/newview/skins/vintage/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_inventory_item_properties.xml
@@ -57,7 +57,7 @@
      height="16"
      layout="topleft"
      left_delta="78"
-     max_length="63"
+     max_length_bytes="63"
      name="LabelItemName"
      top_delta="0"
      width="252" />
@@ -80,7 +80,7 @@
      height="16"
      layout="topleft"
      left_delta="78"
-     max_length="127"
+     max_length_bytes="127"
      name="LabelItemDesc"
      top_delta="0"
      width="252" />