diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 0c1e777fa1..8dbcfe6360 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="panel_im_control_panel"
- width="180"
+ border="false"
  height="215"
- border="false">
+ name="panel_im_control_panel"
+ width="180">
+
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
@@ -16,24 +17,28 @@
      show_info_btn="false"
      show_profile_btn="false"
      top="10"
-     width="180" />
+     width="180"/>
+
     <button
-     name="call_btn"
+     height="20"
      label="Call Group"
      left_delta="27"
-     width="125"
-     height="20" />
+     name="call_btn"
+     width="125"/>
+
     <button
-     name="end_call_btn"
+     height="20"
      label="Leave Call"
-     width="125"
-     height="20" 
-     visible="false"/>
+     name="end_call_btn"
+     visible="false"
+     width="125"/>
+
     <button
      enabled="false"
-     name="voice_ctrls_btn"
-     label="Open Voice Controls"
-     width="125"
      height="20"
-     visible="false"/>
+     label="Open Voice Controls"
+     name="voice_ctrls_btn"
+     visible="false"
+     width="125"/>
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 560d353d00..737bb5bcb6 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="panel_im_control_panel"
- width="180"
+ border="false"
  height="238"
- border="false">
+ name="panel_im_control_panel"
+ width="180">
+
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
@@ -16,29 +17,34 @@
      show_info_btn="false"
      show_profile_btn="false"
      top="10"
-     width="180" />
+     width="180"/>
+
     <button
-     name="group_info_btn"
+     height="20"
      label="Group Info"
      left_delta="27"
-     width="125"
-     height="20" />
+     name="group_info_btn"
+     width="125"/>
+
     <button
-     name="call_btn"
-     label="Call Group"
-     width="125"
-     height="20" />
-    <button
-     name="end_call_btn"
-     label="Leave Call"
-     width="125"
-     height="20" 
-     visible="false"/>
-    <button
-	 enabled="false"
-     name="voice_ctrls_btn"
-     label="Open Voice Controls"
-     width="125"
      height="20"
-     visible="false"/>
+     label="Call Group"
+     name="call_btn"
+     width="125"/>
+
+    <button
+     height="20"
+     label="Leave Call"
+     name="end_call_btn"
+     visible="false"
+     width="125"/>
+
+    <button
+     enabled="false"
+     height="20"
+     label="Open Voice Controls"
+     name="voice_ctrls_btn"
+     visible="false"
+     width="125"/>
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 7308ca3c29..35be31983c 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_im_control_panel"
-       width="128"
-       height="327"
-       border="false">
+<panel
+ border="false"
+ height="327"
+ name="panel_im_control_panel"
+ width="128">
 
-  <avatar_icon name="avatar_icon"
-               follows="left|top"
-               left_delta="3"
-               width="125"
-               height="125" />
+    <avatar_icon
+     follows="left|top"
+     height="125"
+     left_delta="3"
+     name="avatar_icon"
+     width="125"/>
 
-  <button name="view_profile_btn"
-          follows="left|bottom"
-          label="View Profile"
-          width="125"
-		  height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="View Profile"
+     name="view_profile_btn"
+     width="125"/>
 
-  <button name="add_friend_btn"
-          follows="left|bottom"
-          label="Add Friend"
-          width="125"
-          height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Add Friend"
+     name="add_friend_btn"
+     width="125"/>
 
-  <button name="call_btn"
-          follows="left|bottom"
-          label="Call"
-          width="125"
-          height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Call"
+     name="call_btn"
+     width="125"/>
 
     <button
      follows="left|bottom"
@@ -34,31 +39,36 @@
      label="Leave Call"
      name="end_call_btn"
      visible="false"
-     width="125" />
+     width="125"/>
 
-  <button
-	 enabled="false"
+    <button
+     enabled="false"
      follows="left|bottom"
-     name="voice_ctrls_btn"
-     label="Open Voice Controls"
-     width="125"
      height="20"
-     visible="false"/>
+     label="Open Voice Controls"
+     name="voice_ctrls_btn"
+     visible="false"
+     width="125"/>
 
-  <button name="teleport_btn"
-          follows="left|bottom"
-          label="Teleport"
-          width="125"
-          height="20" />
-  <button name="share_btn"
-          follows="left|bottom"
-          label="Share"
-          width="125"
-          height="20" />
-  <button name="pay_btn"
-          follows="left|bottom"
-          label="Pay"
-          width="125"
-          height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Teleport"
+     name="teleport_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Share"
+     name="share_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Pay"
+     name="pay_btn"
+     width="125"/>
 
 </panel>