diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
index 79c7b2234c..2173a5b838 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -10,11 +10,16 @@
 	</context_menu>
 	<menu_item_call label="Hinsetzen" name="Sit Down Here"/>
 	<menu_item_call label="Aufstehen" name="Stand Up"/>
-	<menu_item_call label="Aktuelles Outfit" name="NowWearing"/>
-	<menu_item_call label="Outfit wechseln" name="Change Outfit"/>
-	<menu_item_call label="Form bearbeiten" name="Edit My Shape"/>
-	<menu_item_call label="Outfit bearbeiten" name="Edit Outfit"/>
-	<menu_item_call label="Schwebehöhe" name="Hover Height"/>
+	<context_menu label="Aussehen" name="AppearanceSubmenu">
+		<menu_item_call label="Aktuelles Outfit" name="NowWearing" />
+		<menu_item_call label="Outfit wechseln" name="Change Outfit" />
+		<menu_item_call label="Form bearbeiten" name="Edit Shape" />
+		<menu_item_call label="Outfit bearbeiten" name="Edit Outfit Parts" />
+		<menu_item_call label="Schwebehöhe" name="Hover Height"/>
+		<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
+		<menu_item_call label="Skelett und Animationen zurücksetzen" name="Reset Skeleton And Animations"/>
+		<menu_item_call label="Mesh LOD zurücksetzen" name="Reset Mesh LOD"/>
+	</context_menu>
 	<context_menu label="Ausziehen" name="Take Off &gt;">
 		<context_menu label="Kleidung" name="Clothes &gt;">
 			<menu_item_call label="Hemd" name="Shirt"/>
@@ -35,12 +40,11 @@
 		<context_menu label="Abnehmen" name="Detach Self"/>
 		<menu_item_call label="Alles abnehmen" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
-	<menu_item_call label="Skelett und Animationen zurücksetzen" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Mesh LOD zurücksetzen" name="Reset Mesh LOD"/>
-	<menu_item_call label="Freunde" name="Friends..."/>
-	<menu_item_call label="Gruppen" name="Groups..."/>
-	<menu_item_call label="Profil" name="Profile..."/>
+	<context_menu label="Gemeinschaft" name="CommunitySubmenu">
+		<menu_item_call label="Freunde" name="Friends..."/>
+		<menu_item_call label="Gruppen" name="Groups..."/>
+		<menu_item_call label="Profil" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
 	<menu_item_call label="Untersuchen" name="Object_Inspect_Floater"/>
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index ed49824419..c987354d5b 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -86,46 +86,72 @@ name="Stand Up">
     <menu_item_call.on_enable
      function="Self.EnableStandUp" />
   </menu_item_call>
-  <menu_item_call
-  label="Now wearing..."
-  name="NowWearing">
-    <menu_item_call.on_click
-     function="NowWearing" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call
-  label="Change Outfit"
-  name="Change Outfit">
-    <menu_item_call.on_click
-     function="CustomizeAvatar" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit Shape"
-    layout="topleft"
-    name="Edit Shape">
-    <menu_item_call.on_click
-     function="EditShape" />
-    <menu_item_call.on_enable
-     function="Edit.EnableEditShape" />
-  </menu_item_call>
-  <menu_item_call label="Edit Outfit"
-layout="topleft"
-name="Edit Outfit Parts">
-    <menu_item_call.on_click
-     function="EditOutfit" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Hover Height"
+  <context_menu
+  label="Appearance"
+  layout="topleft"
+  name="AppearanceSubmenu">
+    <menu_item_call
+     label="Now wearing..."
+     name="NowWearing">
+      <menu_item_call.on_click
+       function="NowWearing" />
+      <menu_item_call.on_enable
+       function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+    <menu_item_call
+     label="Change Outfit"
+     name="Change Outfit">
+      <menu_item_call.on_click
+       function="CustomizeAvatar" />
+      <menu_item_call.on_enable
+       function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit Shape"
+     layout="topleft"
+     name="Edit Shape">
+      <menu_item_call.on_click
+       function="EditShape" />
+      <menu_item_call.on_enable
+       function="Edit.EnableEditShape" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit Outfit"
+     layout="topleft"
+     name="Edit Outfit Parts">
+      <menu_item_call.on_click
+       function="EditOutfit" />
+      <menu_item_call.on_enable
+       function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+    <menu_item_call label="Hover Height"
      layout="topleft"
      name="Hover Height">
-     <menu_item_call.on_click
-      function="HoverHeight" />
-     <menu_item_call.on_enable
-      function="Edit.EnableHoverHeight" />
-  </menu_item_call>
+      <menu_item_call.on_click
+       function="HoverHeight" />
+      <menu_item_call.on_enable
+       function="Edit.EnableHoverHeight" />
+    </menu_item_call>
+    <menu_item_separator layout="topleft" />
+    <menu_item_call label="Reset Skeleton"
+     layout="topleft"
+     name="Reset Skeleton">
+      <menu_item_call.on_click
+       function="Avatar.ResetSkeleton" />
+    </menu_item_call>
+    <menu_item_call label="Reset Skeleton And Animations"
+     layout="topleft"
+     name="Reset Skeleton And Animations">
+      <menu_item_call.on_click
+       function="Avatar.ResetSkeletonAndAnimations" />
+    </menu_item_call>
+    <menu_item_call label="Reset Mesh LOD"
+     layout="topleft"
+     name="Reset Mesh LOD">
+      <menu_item_call.on_click
+       function="Avatar.ResetMeshLOD" />
+    </menu_item_call>
+  </context_menu>
   <context_menu
   label="Take off"
   layout="topleft"
@@ -333,51 +359,37 @@ name="Edit Outfit Parts">
      function="Tools.StopAllAnimations" />
   </menu_item_call>
   <menu_item_separator/>
-  <menu_item_call label="Reset Skeleton"
-       layout="topleft"
-       name="Reset Skeleton">
-       <menu_item_call.on_click
-        function="Avatar.ResetSkeleton" />
-  </menu_item_call>
-  <menu_item_call label="Reset Skeleton And Animations"
-       layout="topleft"
-       name="Reset Skeleton And Animations">
-       <menu_item_call.on_click
-        function="Avatar.ResetSkeletonAndAnimations" />
-  </menu_item_call>
-  <menu_item_call label="Reset Mesh LOD"
-       layout="topleft"
-       name="Reset Mesh LOD">
-       <menu_item_call.on_click
-        function="Avatar.ResetMeshLOD" />
-  </menu_item_call>
-
-  <menu_item_call
-    label="Friends"
+  <context_menu
+    label="Community"
     layout="topleft"
-    name="Friends...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="friends_panel" />
-  </menu_item_call>
-  <menu_item_call
-   label="Groups"
-   layout="topleft"
-   name="Groups...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="groups_panel" />
-  </menu_item_call>
-  <menu_item_call
-    label="Profile"
-    layout="topleft"
-    name="Profile...">
-    <menu_item_call.on_click
-     function="ShowAgentProfile"
-     parameter="agent" />
-  </menu_item_call>
+    name="CommunitySubmenu">
+      <menu_item_call
+        label="Friends"
+        layout="topleft"
+        name="Friends...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="friends_panel" />
+      </menu_item_call>
+      <menu_item_call
+        label="Groups"
+        layout="topleft"
+        name="Groups...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="groups_panel" />
+      </menu_item_call>
+      <menu_item_call
+        label="Profile"
+        layout="topleft"
+        name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="agent" />
+      </menu_item_call>
+  </context_menu>
     <menu_item_call
-		 label="Dump XML"
+         label="Dump XML"
          name="Dump XML">
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
index 37588e43fb..c25e3c19b7 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -9,15 +9,19 @@
 	</context_menu>
 	<menu_item_call label="Sentarme" name="Sit Down Here"/>
 	<menu_item_call label="Levantarme" name="Stand Up"/>
-	<menu_item_call label="Apariencia" name="Change Outfit"/>
-	<menu_item_call label="Editar vestuario" name="Edit Outfit"/>
-	<menu_item_call label="Editar anatomía" name="Edit My Shape"/>
-	<menu_item_call label="Altura del avatar" name="Hover Height"/>
-	<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
-	<menu_item_call label="Restablecer esqueleto y animaciones" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Amigos" name="Friends..."/>
-	<menu_item_call label="Grupos" name="Groups..."/>
-	<menu_item_call label="Perfil" name="Profile..."/>
+	<context_menu label="Apariencia" name="AppearanceSubmenu">
+		<menu_item_call label="Apariencia" name="Change Outfit" />
+		<menu_item_call label="Editar anatomía" name="Edit Shape" />
+		<menu_item_call label="Editar vestuario" name="Edit Outfit Parts" />
+		<menu_item_call label="Altura del avatar" name="Hover Height"/>
+		<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
+		<menu_item_call label="Restablecer esqueleto y animaciones" name="Reset Skeleton And Animations"/>
+	</context_menu>
+	<context_menu label="Comunidad" name="CommunitySubmenu">
+		<menu_item_call label="Amigos" name="Friends..."/>
+		<menu_item_call label="Grupos" name="Groups..."/>
+		<menu_item_call label="Perfil" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Información de scripts" name="ScriptInfo"/>
 	<menu_item_call label="Desdibujar temporalmente" name="Derender"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
index c4d2988b13..bcb3466b49 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -10,15 +10,19 @@
 	</context_menu>
 	<menu_item_call label="S'asseoir" name="Sit Down Here"/>
 	<menu_item_call label="Se lever" name="Stand Up"/>
-	<menu_item_call label="Changer de tenue" name="Change Outfit"/>
-	<menu_item_call label="Modifier la tenue" name="Edit Outfit"/>
-	<menu_item_call label="Modifier la silhouette" name="Edit My Shape"/>
-	<menu_item_call label="Voltigement" name="Hover Height"/>
-	<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
-	<menu_item_call label="Réinitialiser le squelette et les animations" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Amis" name="Friends..."/>
-	<menu_item_call label="Groupes" name="Groups..."/>
-	<menu_item_call label="Profil" name="Profile..."/>
+	<context_menu label="Apparence" name="AppearanceSubmenu">
+		<menu_item_call label="Changer de tenue" name="Change Outfit" />
+		<menu_item_call label="Modifier la silhouette" name="Edit Shape" />
+		<menu_item_call label="Modifier la tenue" name="Edit Outfit Parts" />
+		<menu_item_call label="Voltigement" name="Hover Height"/>
+		<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
+		<menu_item_call label="Réinitialiser le squelette et les animations" name="Reset Skeleton And Animations"/>
+	</context_menu>
+	<context_menu label="Communauté" name="CommunitySubmenu">
+		<menu_item_call label="Amis" name="Friends..."/>
+		<menu_item_call label="Groupes" name="Groups..."/>
+		<menu_item_call label="Profil" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Informations sur les scripts" name="ScriptInfo"/>
 	<menu_item_call label="Faire disparaitre temporairement" name="Derender"/>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index 83dcb45ca2..36925a9251 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -9,16 +9,20 @@
 	</context_menu>
 	<menu_item_call label="Siedi" name="Sit Down Here"/>
 	<menu_item_call label="Alzati" name="Stand Up"/>
-	<menu_item_call label="Il mio aspetto" name="Change Outfit"/>
-	<menu_item_call label="Modifica abito" name="Edit Outfit"/>
-	<menu_item_call label="Modifica corpo" name="Edit My Shape"/>
-	<menu_item_call label="Altezza di volo" name="Hover Height"/>
-	<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
-	<menu_item_call label="Ripristina scheletro e animazioni" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Ripristina LOD mesh" name="Reset Mesh LOD" />
-	<menu_item_call label="I miei amici..." name="Friends..."/>
-	<menu_item_call label="I miei gruppi" name="Groups..."/>
-	<menu_item_call label="Il mio profilo" name="Profile..."/>
+	<context_menu label="Aspetto" name="AppearanceSubmenu">
+		<menu_item_call label="Il mio aspetto" name="Change Outfit"/>
+		<menu_item_call label="Modifica corpo" name="Edit Shape" />
+		<menu_item_call label="Modifica abito" name="Edit Outfit Parts" />
+		<menu_item_call label="Altezza di volo" name="Hover Height"/>
+		<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
+		<menu_item_call label="Ripristina scheletro e animazioni" name="Reset Skeleton And Animations"/>
+		<menu_item_call label="Ripristina LOD mesh" name="Reset Mesh LOD" />
+	</context_menu>
+	<context_menu label="Comunità" name="CommunitySubmenu">
+		<menu_item_call label="I miei amici..." name="Friends..."/>
+		<menu_item_call label="I miei gruppi" name="Groups..."/>
+		<menu_item_call label="Il mio profilo" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="Scarica XML" name="Dump XML"/>
 	<menu_item_call label="Info script" name="ScriptInfo"/>
 	<menu_item_call label="De-rendi" name="Derender"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index 9dc3e9ce54..bcf53ff8dc 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -9,11 +9,16 @@
 	</context_menu>
 	<menu_item_call label="座る" name="Sit Down Here"/>
 	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<menu_item_call label="装着中..." name="NowWearing"/>
-	<menu_item_call label="アウトフィットの変更" name="Change Outfit"/>
-	<menu_item_call label="シェイプの編集" name="Edit Shape"/>
-	<menu_item_call label="アウトフィットの編集" name="Edit Outfit Parts" />
-	<menu_item_call label="ホバーの高さ" name="Hover Height"/>
+	<context_menu label="外観" name="AppearanceSubmenu">
+		<menu_item_call label="装着中..." name="NowWearing"/>
+		<menu_item_call label="アウトフィットの変更" name="Change Outfit"/>
+		<menu_item_call label="シェイプの編集" name="Edit Shape"/>
+		<menu_item_call label="アウトフィットの編集" name="Edit Outfit Parts" />
+		<menu_item_call label="ホバーの高さ" name="Hover Height"/>
+		<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+		<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
+		<menu_item_call label="メッシュ LOD をリセット" name="Reset Mesh LOD" />
+	</context_menu>
 	<context_menu label="取り外す" name="Take Off &gt;">
 		<context_menu label="衣類" name="Clothes &gt;">
 			<menu_item_call label="シャツ" name="Shirt" />
@@ -37,12 +42,11 @@
 	<menu_item_call label="座る/立ち上がる" name="Sit stand" />
 	<menu_item_call label="飛ぶ/着地する" name="Fly land" />
 	<menu_item_call label="自分のアニメーションを停止する" name="Stop Animating My Avatar" />
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="メッシュ LOD をリセット" name="Reset Mesh LOD" />
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
+	<context_menu label="コミュニティ" name="CommunitySubmenu">
+		<menu_item_call label="フレンド" name="Friends..."/>
+		<menu_item_call label="グループ" name="Groups..."/>
+		<menu_item_call label="プロフィール" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect" />
 	<menu_item_call label="検査" name="Object_Inspect_Floater" />
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
index 8cdc550655..843f866f07 100644
--- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
@@ -10,11 +10,16 @@
 	</context_menu>
 	<menu_item_call label="Usiądź tutaj" name="Sit Down Here"/>
 	<menu_item_call label="Wstań" name="Stand Up"/>
-	<menu_item_call label="Mój wygląd" name="NowWearing" />
-	<menu_item_call label="Zmień strój" name="Change Outfit" />
-	<menu_item_call label="Edytuj kształt" name="Edit Shape" />
-	<menu_item_call label="Edytuj strój" name="Edit Outfit Parts" />
-	<menu_item_call label="Uniesienie" name="Hover Height"/>
+	<context_menu label="Wygląd" name="AppearanceSubmenu">
+		<menu_item_call label="Mój wygląd" name="NowWearing" />
+		<menu_item_call label="Zmień strój" name="Change Outfit" />
+		<menu_item_call label="Edytuj kształt" name="Edit Shape" />
+		<menu_item_call label="Edytuj strój" name="Edit Outfit Parts" />
+		<menu_item_call label="Uniesienie" name="Hover Height"/>
+		<menu_item_call label="Reset szkieletu" name="Reset Skeleton"/>
+		<menu_item_call label="Reset szkieletu i animacji" name="Reset Skeleton And Animations"/>
+		<menu_item_call label="Reset detali meszu" name="Reset Mesh LOD" />
+	</context_menu>
 	<context_menu label="Zdejmij" name="Take Off &gt;">
 		<context_menu label="Ubranie" name="Clothes &gt;">
 			<menu_item_call label="Koszula" name="Shirt" />
@@ -37,12 +42,11 @@
 	<menu_item_call label="Usiądź / wstań" name="Sit stand" />
 	<menu_item_call label="Lataj / wyląduj" name="Fly land" />
 	<menu_item_call label="Zatrzymaj animacje" name="Stop Animating My Avatar" />
-	<menu_item_call label="Reset szkieletu" name="Reset Skeleton"/>
-	<menu_item_call label="Reset szkieletu i animacji" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Reset detali meszu" name="Reset Mesh LOD" />
-	<menu_item_call label="Moi znajomi" name="Friends..."/>
-	<menu_item_call label="Moje grupy" name="Groups..."/>
-	<menu_item_call label="Mój profil" name="Profile..."/>
+	<context_menu label="Społeczność" name="CommunitySubmenu">
+		<menu_item_call label="Moi znajomi" name="Friends..."/>
+		<menu_item_call label="Moje grupy" name="Groups..."/>
+		<menu_item_call label="Mój profil" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="Zrzuć XML" name="Dump XML"/>
 	<menu_item_call label="Profil obiektu" name="Object Inspect" />
 	<menu_item_call label="Inspekcja" name="Object_Inspect_Floater" />
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
index 47846fb01e..bbc2eb423f 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -10,11 +10,16 @@
 	</context_menu>
 	<menu_item_call label="Сесть" name="Sit Down Here"/>
 	<menu_item_call label="Встать" name="Stand Up"/>
-	<menu_item_call label="Сейчас ношу..." name="NowWearing"/>
-	<menu_item_call label="Сменить комплект" name="Change Outfit"/>
-	<menu_item_call label="Изменить фигуру" name="Edit Shape"/>
-	<menu_item_call label="Редактировать комплект" name="Edit Outfit Parts"/>
-	<menu_item_call label="Высота над землей" name="Hover Height"/>
+	<context_menu label="Внешность" name="AppearanceSubmenu">
+		<menu_item_call label="Сейчас ношу..." name="NowWearing"/>
+		<menu_item_call label="Сменить комплект" name="Change Outfit"/>
+		<menu_item_call label="Изменить фигуру" name="Edit Shape"/>
+		<menu_item_call label="Редактировать комплект" name="Edit Outfit Parts"/>
+		<menu_item_call label="Высота над землей" name="Hover Height"/>
+		<menu_item_call label="Сброс Скелета" name="Reset Skeleton"/>
+		<menu_item_call label="Сброс Скелета и анимаций" name="Reset Skeleton And Animations"/>
+		<menu_item_call label="Сброс Mesh LOD" name="Reset Mesh LOD"/>
+	</context_menu>
 	<context_menu label="Снять" name="Take Off &gt;">
 		<context_menu label="Одежду" name="Clothes &gt;">
 			<menu_item_call label="Рубашку" name="Shirt"/>
@@ -38,12 +43,11 @@
 	<menu_item_call label="Сесть/встать" name="Sit stand"/>
 	<menu_item_call label="Летать/посадка" name="Fly land"/>
 	<menu_item_call label="Остановить анимации" name="Stop Animating My Avatar"/>
-	<menu_item_call label="Сброс Скелета" name="Reset Skeleton"/>
-	<menu_item_call label="Сброс Скелета и анимаций" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Сброс Mesh LOD" name="Reset Mesh LOD"/>
-	<menu_item_call label="Друзья" name="Friends..."/>
-	<menu_item_call label="Группы" name="Groups..."/>
-	<menu_item_call label="Профиль" name="Profile..."/>
+	<context_menu label="Сообщество" name="CommunitySubmenu">
+		<menu_item_call label="Друзья" name="Friends..."/>
+		<menu_item_call label="Группы" name="Groups..."/>
+		<menu_item_call label="Профиль" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="Дамп XML" name="Dump XML"/>
 	<menu_item_call label="Профиль Объекта" name="Object Inspect"/>
 	<menu_item_call label="Инспектировать" name="Object_Inspect_Floater"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
index fd166ddd68..a5c25f1e0b 100644
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -5,15 +5,19 @@
 	<menu_item_call label="Ayır" name="Detach"/>
 	<menu_item_call label="Otur" name="Sit Down Here"/>
 	<menu_item_call label="Kalk" name="Stand Up"/>
-	<menu_item_call label="Görünümüm" name="Change Outfit"/>
-	<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit"/>
-	<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
-	<menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
-	<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
-	<menu_item_call label="İskeleti ve Animasyonları Sıfırla" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="Arkadaşlarım" name="Friends..."/>
-	<menu_item_call label="Gruplarım" name="Groups..."/>
-	<menu_item_call label="Profilim" name="Profile..."/>
+	<context_menu label="Dış görünüş" name="AppearanceSubmenu">
+		<menu_item_call label="Görünümüm" name="Change Outfit"/>
+		<menu_item_call label="Şeklimi Düzenle" name="Edit Shape"/>
+		<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit Parts" />
+		<menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
+		<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
+		<menu_item_call label="İskeleti ve Animasyonları Sıfırla" name="Reset Skeleton And Animations"/>
+	</context_menu>
+	<context_menu label="Toplum" name="CommunitySubmenu">
+		<menu_item_call label="Arkadaşlarım" name="Friends..."/>
+		<menu_item_call label="Gruplarım" name="Groups..."/>
+		<menu_item_call label="Profilim" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
 	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Bırak" name="Drop"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index 040ec94aad..eb0d922d05 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -5,15 +5,18 @@
 	<menu_item_call label="卸下" name="Detach"/>
 	<menu_item_call label="坐下" name="Sit Down Here"/>
 	<menu_item_call label="起立" name="Stand Up"/>
-	<menu_item_call label="我的外觀" name="Change Outfit"/>
-	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
-	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
-	<menu_item_call label="懸浮高度" name="Hover Height"/>
-	<menu_item_call label="重設骨架" name="Reset Skeleton"/>
-	<menu_item_call label="重設骨架和動作" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的群組" name="Groups..."/>
-	<menu_item_call label="我的個人檔案" name="Profile..."/>
+	<context_menu label="外觀" name="AppearanceSubmenu">
+		<menu_item_call label="我的外觀" name="Change Outfit"/>
+		<menu_item_call label="編輯我的體形" name="Edit Shape"/>
+		<menu_item_call label="懸浮高度" name="Hover Height"/>
+		<menu_item_call label="重設骨架" name="Reset Skeleton"/>
+		<menu_item_call label="重設骨架和動作" name="Reset Skeleton And Animations"/>
+	</context_menu>
+	<context_menu label="社區" name="CommunitySubmenu">
+		<menu_item_call label="我的朋友" name="Friends..."/>
+		<menu_item_call label="我的群組" name="Groups..."/>
+		<menu_item_call label="我的個人檔案" name="Profile..."/>
+	</context_menu>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="丟棄" name="Drop"/>