diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 8d2bc387ca29..2a2007dd1296 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -888,6 +888,34 @@ group.MacrosGroup.text=Macro Actions
 action.ValidateXml.text=_Validate
 action.ValidateXml.description=Validate the current XML file
 action.GenerateDTD.text=Generate DTD from _XML File
+action.EmmetPreviousEditPoint.text=Previous Emmet Edit Point
+action.EmmetPreviousEditPoint.description=Go to previous Emmet edit point
+action.EmmetNextEditPoint.text=Next Emmet Edit Point
+action.EmmetNextEditPoint.description=Go to next Emmet edit point
+action.EmmetUpdateTag.text=Update tag with Emmet
+action.EmmetUpdateTag.description=Update existing HTML tag with Emmet abbreviation
+action.EmmetPreview.text=Emmet Preview
+action.EmmetPreview.description=Show preview for emmet abbreviation
+action.SurroundWithEmmet.text=Surround with Emmet
+action.SurroundWithEmmet.description=Surround selected code with Emmet abbreviation
+group.Emmet.text=Emmet
+group.OpenInBrowserEditorContextBarGroupAction.description=Open In...
+action.OpenInBrowser.text=Open in default _browser
+action.OpenInBrowser.description=Open selected file in default browser
+action.EscapeEntities.text=Encode XML/HTML Special Characters
+action.EscapeEntities.description=Escape XML/HTML special characters with entities
+action.GenerateXmlTag.text=XML Tag...
+action.GenerateXmlTag.description=Generate a new XML tag according to schema information
+group.NewXmlDescriptor.text=XML Configuration File
+group.NewXml.text=XML
+action.DomCollectionControl.Remove.text=Remove
+action.DomCollectionControl.Edit.text=Edit
+action.DomCollectionControl.Add.text=Add
+action.DomElementsTreeView.DeleteElement.text=Delete element
+action.DomElementsTreeView.AddElement.text=Insert element
+action.DomElementsTreeView.GotoDomElementDeclarationAction.text=Goto Element
+action.Document2XSD.text=Generate XML Document from XSD Schema...
+action.XSD2Document.text=Generate XSD Schema from XML File...
 group.ExternalToolsGroup.text=External Tools
 action.PsiViewer.text=_View PSI Structure...
 action.PsiViewerForContext.text=View PSI Structure of Cu_rrent File...
diff --git a/platform/platform-resources/src/META-INF/XmlActions.xml b/platform/platform-resources/src/META-INF/XmlActions.xml
index d2d82c5c27b6..4bfe02269c10 100644
--- a/platform/platform-resources/src/META-INF/XmlActions.xml
+++ b/platform/platform-resources/src/META-INF/XmlActions.xml
@@ -4,8 +4,8 @@
     <group id="ToolsXmlGroup" popup="true" class="com.intellij.xml.actions.XmlActionsGroup">
       <action id="ValidateXml" class="com.intellij.xml.actions.validate.ValidateXmlAction"/>
       <action id="GenerateDTD" class="com.intellij.codeInsight.actions.GenerateDTDAction"/>
-      <action id="XSD2Document" class="com.intellij.xml.actions.xmlbeans.GenerateSchemaFromInstanceDocumentAction" text="Generate XSD Schema from XML File..."/>
-      <action id="Document2XSD" class="com.intellij.xml.actions.xmlbeans.GenerateInstanceDocumentFromSchemaAction" text="Generate XML Document from XSD Schema..."/>
+      <action id="XSD2Document" class="com.intellij.xml.actions.xmlbeans.GenerateSchemaFromInstanceDocumentAction"/>
+      <action id="Document2XSD" class="com.intellij.xml.actions.xmlbeans.GenerateInstanceDocumentFromSchemaAction"/>
       <separator/>
 
       <add-to-group group-id="ToolsMenu" anchor="before" relative-to-action="ExternalToolsGroup"/>
@@ -29,15 +29,13 @@
 
     <action id="DomElementsTreeView.GotoDomElementDeclarationAction"
             class="com.intellij.util.xml.tree.actions.GotoDomElementDeclarationAction"
-            text="Goto Element"
             use-shortcut-of="EditSource"/>
 
-    <action id="DomElementsTreeView.AddElement" class="com.intellij.util.xml.tree.actions.AddElementInCollectionAction"
-            text="Insert element">
+    <action id="DomElementsTreeView.AddElement" class="com.intellij.util.xml.tree.actions.AddElementInCollectionAction">
       <keyboard-shortcut first-keystroke="INSERT" keymap="$default"/>
     </action>
     <action id="DomElementsTreeView.DeleteElement" class="com.intellij.util.xml.tree.actions.DeleteDomElement"
-            text="Delete element" use-shortcut-of="$Delete"/>
+            use-shortcut-of="$Delete"/>
 
     <group id="DomElementsTreeView.AddElementGroup" class="com.intellij.util.xml.tree.actions.AddDomElementActionGroup"/>
 
@@ -50,37 +48,32 @@
     </group>
 
     <group id="DomCollectionControl">
-      <action id="DomCollectionControl.Add" class="com.intellij.util.xml.ui.DomCollectionControl$AddAction" text="Add">
+      <action id="DomCollectionControl.Add" class="com.intellij.util.xml.ui.DomCollectionControl$AddAction">
         <keyboard-shortcut first-keystroke="INSERT" keymap="$default"/>
       </action>
-      <action id="DomCollectionControl.Edit" class="com.intellij.util.xml.ui.DomCollectionControl$EditAction" text="Edit" use-shortcut-of="EditSource"/>
-      <action id="DomCollectionControl.Remove" class="com.intellij.util.xml.ui.DomCollectionControl$RemoveAction" text="Remove" use-shortcut-of="$Delete"/>
+      <action id="DomCollectionControl.Edit" class="com.intellij.util.xml.ui.DomCollectionControl$EditAction" use-shortcut-of="EditSource"/>
+      <action id="DomCollectionControl.Remove" class="com.intellij.util.xml.ui.DomCollectionControl$RemoveAction" use-shortcut-of="$Delete"/>
     </group>
 
-    <group id="NewXml" text="XML">
+    <group id="NewXml">
       <action id="NewHtmlFile" class="com.intellij.ide.actions.CreateHtmlFileAction"/>
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
     </group>
 
-    <group id="NewXmlDescriptor" class="com.intellij.ide.actions.NonTrivialActionGroup" text="XML Configuration File" popup="true" icon="AllIcons.FileTypes.Xml">
+    <group id="NewXmlDescriptor" class="com.intellij.ide.actions.NonTrivialActionGroup" popup="true" icon="AllIcons.FileTypes.Xml">
       <add-to-group group-id="NewGroup" anchor="last"/>
     </group>
 
-    <action id="GenerateXmlTag" class="com.intellij.xml.actions.GenerateXmlTagAction"
-            text="XML Tag..."
-            description="Generate a new XML tag according to schema information">
+    <action id="GenerateXmlTag" class="com.intellij.xml.actions.GenerateXmlTagAction">
       <add-to-group group-id="GenerateGroup" anchor="first"/>
     </action>
 
-    <action id="EscapeEntities" class="com.intellij.xml.actions.EscapeEntitiesAction"
-            text="Encode XML/HTML Special Characters"
-            description="Escape XML/HTML special characters with entities">
+    <action id="EscapeEntities" class="com.intellij.xml.actions.EscapeEntitiesAction">
       <add-to-group group-id="EditMenu" anchor="last"/>
     </action>
 
     <!-- id should be "OpenInDefaultBrowser", but existing name preserved to keep compatibility - if user configured shortcut for action, it should not be lost -->
     <action id="OpenInBrowser" class="com.intellij.ide.browsers.actions.OpenFileInDefaultBrowserAction"
-            text="Open in default _browser" description="Open selected file in default browser"
             icon="AllIcons.Nodes.PpWeb">
     </action>
 
@@ -89,18 +82,14 @@
       <add-to-group group-id="RunContextPopupGroup" anchor="last"/>
     </group>
     <group id="OpenInBrowserEditorContextBarGroupAction"
-           class="com.intellij.ide.browsers.actions.OpenInBrowserBaseGroupAction$OpenInBrowserEditorContextBarGroupAction"
-           description="Open In...">
+           class="com.intellij.ide.browsers.actions.OpenInBrowserBaseGroupAction$OpenInBrowserEditorContextBarGroupAction">
       <add-to-group group-id="EditorContextBarMenu" anchor="last"/>
     </group>
 
-    <group id="Emmet" text="Emmet">
-      <action id="SurroundWithEmmet" class="com.intellij.codeInsight.template.emmet.SurroundWithEmmetAction" 
-              text="Surround with Emmet" description="Surround selected code with Emmet abbreviation"/>
-      <action id="EmmetPreview" class="com.intellij.codeInsight.template.emmet.EmmetPreviewAction" 
-              text="Emmet Preview" description="Show preview for emmet abbreviation"/>
-      <action id="EmmetUpdateTag" class="com.intellij.codeInsight.template.emmet.EmmetUpdateTagAction" 
-              text="Update tag with Emmet" description="Update existing HTML tag with Emmet abbreviation">
+    <group id="Emmet">
+      <action id="SurroundWithEmmet" class="com.intellij.codeInsight.template.emmet.SurroundWithEmmetAction"/>
+      <action id="EmmetPreview" class="com.intellij.codeInsight.template.emmet.EmmetPreviewAction"/>
+      <action id="EmmetUpdateTag" class="com.intellij.codeInsight.template.emmet.EmmetUpdateTagAction">
         <add-to-group group-id="EditorLangPopupMenu" anchor="last"/>
       </action>
 
@@ -108,15 +97,13 @@
         <separator/>
         <add-to-group group-id="GoToMenu" anchor="after" relative-to-action="GoToErrorGroup"/>
 
-        <action id="EmmetNextEditPoint" class="com.intellij.codeInsight.template.emmet.actions.GoToEditPointAction$Forward"
-                text="Next Emmet Edit Point" description="Go to next Emmet edit point">
+        <action id="EmmetNextEditPoint" class="com.intellij.codeInsight.template.emmet.actions.GoToEditPointAction$Forward">
           <keyboard-shortcut first-keystroke="alt shift CLOSE_BRACKET" keymap="$default"/>
           <keyboard-shortcut first-keystroke="control alt RIGHT" keymap="Mac OS X" replace-all="true"/>
           <keyboard-shortcut first-keystroke="control alt RIGHT" keymap="Mac OS X 10.5+" replace-all="true"/>
         </action>
 
-        <action id="EmmetPreviousEditPoint" class="com.intellij.codeInsight.template.emmet.actions.GoToEditPointAction$Backward"
-                text="Previous Emmet Edit Point" description="Go to previous Emmet edit point">
+        <action id="EmmetPreviousEditPoint" class="com.intellij.codeInsight.template.emmet.actions.GoToEditPointAction$Backward">
           <keyboard-shortcut first-keystroke="alt shift OPEN_BRACKET" keymap="$default"/>
           <keyboard-shortcut first-keystroke="control alt LEFT" keymap="Mac OS X" replace-all="true"/>
           <keyboard-shortcut first-keystroke="control alt LEFT" keymap="Mac OS X 10.5+" replace-all="true"/>