diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index e1f4cd768..0557dc49a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -45,7 +45,7 @@
       <name_editor bevel_style="in" border_style="line"
 			     border_thickness="1" bottom="-24" enabled="false" follows="left|top"
 			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-			     max_length="254" mouse_opaque="false" name="key_"
+			     max_length="254" mouse_opaque="false" name="avatar_key"
 			     width="256" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-48" drop_shadow_visible="true" follows="left|top"
@@ -110,14 +110,6 @@
 			     width="121">
 				[FIRST] [LAST]
 			</line_editor>
-			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="23" label="" left="40"  bottom="-42" width="24" 
-			 image_selected="icon_avatar_expand.png" 
-			 image_unselected="icon_avatar_expand.png"
-			 image_hover_selected="icon_avatar_expand.png" 
-			 image_hover_unselected="icon_avatar_expand.png"
-			 mouse_opaque="true" 
-			  name="bigimg"/>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-68" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
@@ -379,14 +371,6 @@
 			     default_image_name="None" follows="left|top" height="151" label=""
 			     left="70" mouse_opaque="true" name="img"
 			     tool_tip="Click to choose a picture" width="135" />
-			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="23" label="" left="30"  bottom="-42" width="24" 
-			 image_selected="icon_avatar_expand.png" 
-			 image_unselected="icon_avatar_expand.png"
-			 image_hover_selected="icon_avatar_expand.png" 
-			 image_hover_unselected="icon_avatar_expand.png"
-			 mouse_opaque="true" 
-			  name="flbigimg"/>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-203" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"