Merge remote-tracking branch 'origin/main-menu-redesign'

82 files changed, 946 insertions, 415 deletions

diff --git a/main/external/xwt b/main/external/xwt
-Subproject 22a30b1c6706ae4d93b025b728b1b986a6828ff
+Subproject a64b65f922c3b88adf4e78345e012f253050a60
diff --git a/main/po/ca.po b/main/po/ca.po
index 431f181ac3..843564b741 100644
--- a/main/po/ca.po
+++ b/main/po/ca.po
@@ -1695,7 +1695,7 @@ msgstr "Mostra la finestra de preferències del MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Polítiques per defecte..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6749,7 +6749,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Política personalitzada"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19898,7 +19898,7 @@ msgstr "Preferències..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Polítiques per defecte..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/cs.po b/main/po/cs.po
index 751e7456a8..f0013a9240 100644
--- a/main/po/cs.po
+++ b/main/po/cs.po
@@ -1661,7 +1661,7 @@ msgstr "Zobrazit okno nastavení MnoDevelopu"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Implicitní pravidla..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6671,7 +6671,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Uživatelské zásady"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19624,7 +19624,7 @@ msgstr "Nastavení..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Implicitní pravidla..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/da.po b/main/po/da.po
index b1d8b83983..798c585304 100644
--- a/main/po/da.po
+++ b/main/po/da.po
@@ -1750,7 +1750,7 @@ msgstr "MonoDevelop-pakke"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Oversætter:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7146,7 +7146,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Oversætter:"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20493,7 +20493,7 @@ msgstr "Referencer"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Oversætter:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/de.po b/main/po/de.po
index 47ed93d554..64fc9911f5 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -1643,7 +1643,7 @@ msgid "Show MonoDevelop preferences window"
 msgstr "MonoDevelop-Einstellungsfenster anzeigen"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "_Benutzerrichtlinien..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6701,7 +6701,7 @@ msgstr ""
 "Projektes oder einer Projektmappe enthält."
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Benutzerdefinierte Richtlinie"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19440,7 +19440,7 @@ msgid "Preferences..."
 msgstr "Einstellungen..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Benutzerrichtlinien..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/es.po b/main/po/es.po
index c9bb75043e..aeb03b9569 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -1691,7 +1691,7 @@ msgstr "Mostrar ventana de preferencias de MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Políticas predeterminadas"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6797,7 +6797,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Política personalizada"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19913,7 +19913,7 @@ msgstr "Pre_ferencias..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Políticas predeterminadas"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/fr.po b/main/po/fr.po
index 29551c4ea9..0710d5e866 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -1690,7 +1690,7 @@ msgstr "Afficher la fenêtre de préférences MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Stratégies par défaut"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6912,7 +6912,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Stratégie personnalisée"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20070,7 +20070,7 @@ msgstr "Préférences"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Stratégies par défaut"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/gl.po b/main/po/gl.po
index 62ed056060..10de8d415b 100644
--- a/main/po/gl.po
+++ b/main/po/gl.po
@@ -1732,7 +1732,7 @@ msgstr "Preferencias de MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Compilador :"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7055,7 +7055,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Lista de comandos personalizados"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20230,7 +20230,7 @@ msgstr "Preferencias"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Compilador :"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/hu.po b/main/po/hu.po
index f4f25d7641..8c48fe48b8 100644
--- a/main/po/hu.po
+++ b/main/po/hu.po
@@ -1724,7 +1724,7 @@ msgstr "MonoDevelop beállítása"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Alapértelmezett irányelvek"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6907,7 +6907,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Egyéni szabályok"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19925,7 +19925,7 @@ msgstr "Tulajdonságok"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Alapértelmezett irányelvek"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/id.po b/main/po/id.po
index bf10bff92c..4e1bde7802 100644
--- a/main/po/id.po
+++ b/main/po/id.po
@@ -1733,7 +1733,7 @@ msgstr "Preferensi MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Compiler:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7073,7 +7073,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Custom policy"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20379,7 +20379,7 @@ msgstr "Preferensi"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Compiler:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/it.po b/main/po/it.po
index b651cacc08..5a2b48bb0d 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -1732,7 +1732,7 @@ msgstr "Mostra la finestra delle preferenze di MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Politiche predefinite"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6915,7 +6915,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Politica personalizzata"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20057,7 +20057,7 @@ msgstr "Preferenze"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Politiche predefinite"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/ja.po b/main/po/ja.po
index 50938684fc..6723db9c20 100644
--- a/main/po/ja.po
+++ b/main/po/ja.po
@@ -1671,7 +1671,7 @@ msgstr "MonoDevelopの設定ウィンドウを表示"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "デフォルト ポリシー"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6796,7 +6796,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "カスタム ポリシー"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19859,7 +19859,7 @@ msgstr "設定"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "デフォルト ポリシー"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/ko.po b/main/po/ko.po
index 23344ca139..d59b50dd52 100644
--- a/main/po/ko.po
+++ b/main/po/ko.po
@@ -1622,7 +1622,7 @@ msgid "Show MonoDevelop preferences window"
 msgstr "MonoDevelop 설정 창을 표시"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "사용자 정의 정책... (_l)"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6555,7 +6555,7 @@ msgstr ""
 "없습니다."
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "사용자 정의 정책"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -18927,7 +18927,7 @@ msgid "Preferences..."
 msgstr "환경 설정..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "사용자 정의 정책..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/nb.po b/main/po/nb.po
index 8a12a14bf6..c93faff6a6 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -1608,7 +1608,7 @@ msgid "Show MonoDevelop preferences window"
 msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6458,7 +6458,7 @@ msgid ""
 msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
-msgid "Custom Policies"
+msgid "Policies"
 msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -18657,7 +18657,7 @@ msgid "Preferences..."
 msgstr ""
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr ""
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/nl.po b/main/po/nl.po
index dd18fe6ded..41e2eeaa3e 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -1754,7 +1754,7 @@ msgstr "MonoDevelop voorkeuren"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Standaard C-compiler:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7151,7 +7151,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Ander beleid"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20484,7 +20484,7 @@ msgstr "Voorkeuren"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Standaard C-compiler:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/pl.po b/main/po/pl.po
index 0587cf9525..2e0cb90cbc 100644
--- a/main/po/pl.po
+++ b/main/po/pl.po
@@ -1741,7 +1741,7 @@ msgstr "Preferencje MonoDevelopa"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Kompilator:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7093,7 +7093,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Własna lista poleceń"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20416,7 +20416,7 @@ msgstr "Referencje"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Kompilator:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/pt.po b/main/po/pt.po
index 25d40a2e8b..3f10eba98d 100644
--- a/main/po/pt.po
+++ b/main/po/pt.po
@@ -1746,7 +1746,7 @@ msgstr "Preferências do MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Compilador:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7111,7 +7111,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Lista de comandos personalizados"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20379,7 +20379,7 @@ msgstr "Referências"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Compilador:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 6433bfee1b..2c2729c514 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -1671,7 +1671,7 @@ msgstr "Mostra a janela de preferências do MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Políticas Padrão..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6788,7 +6788,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Política personalizada"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19820,7 +19820,7 @@ msgstr "Preferências..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Políticas Padrão..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/ru.po b/main/po/ru.po
index 8d2bc04153..11a7fbf684 100644
--- a/main/po/ru.po
+++ b/main/po/ru.po
@@ -1731,7 +1731,7 @@ msgstr "Настройки MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Правила по умолчанию..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6939,7 +6939,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Пользовательский список команд"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20085,7 +20085,7 @@ msgstr "Параметры..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Правила по умолчанию..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/sl.po b/main/po/sl.po
index 69f34cf092..d51f1a591e 100644
--- a/main/po/sl.po
+++ b/main/po/sl.po
@@ -1746,7 +1746,7 @@ msgstr "MonoDevelop nastavitve"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Prevajalnik:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7123,7 +7123,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Prevajalnik:"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20434,7 +20434,7 @@ msgstr "Reference"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Prevajalnik:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/sv.po b/main/po/sv.po
index 724b911eeb..206f82301d 100644
--- a/main/po/sv.po
+++ b/main/po/sv.po
@@ -1724,7 +1724,7 @@ msgstr "Inställningar för MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Standardnamnrymd:"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7052,7 +7052,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Standardnamnrymd:"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20162,7 +20162,7 @@ msgstr "Referenser"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Standardnamnrymd:"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/tr.po b/main/po/tr.po
index 122833f516..7ec49f149a 100644
--- a/main/po/tr.po
+++ b/main/po/tr.po
@@ -1735,7 +1735,7 @@ msgstr "MonoDevelop Tercihleri"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Ön_tanımlı sabit genişlikli yazıtipi"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -7035,7 +7035,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Özel kural"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -20301,7 +20301,7 @@ msgstr "Tercihler"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Ön_tanımlı sabit genişlikli yazıtipi"
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/uk.po b/main/po/uk.po
index a19bc71d17..e1525fccaf 100644
--- a/main/po/uk.po
+++ b/main/po/uk.po
@@ -1630,7 +1630,7 @@ msgid "Show MonoDevelop preferences window"
 msgstr "Показати вікно уподобань MonoDevelop"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "Власні по_літики..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6511,7 +6511,7 @@ msgstr ""
 "рішень"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "Власні політики"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -18888,7 +18888,7 @@ msgid "Preferences..."
 msgstr "Уподобання..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "Власні політики..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/po/zh_TW.po b/main/po/zh_TW.po
index 2ec3534b61..1df1b0c33c 100644
--- a/main/po/zh_TW.po
+++ b/main/po/zh_TW.po
@@ -1642,7 +1642,7 @@ msgstr "顯示 MonoDevelop 偏好設定視窗"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
 #, fuzzy
-msgid "Custom Po_licies..."
+msgid "Po_licies..."
 msgstr "預設方針..."
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:7
@@ -6667,7 +6667,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
 #, fuzzy
-msgid "Custom Policies"
+msgid "Policies"
 msgstr "自訂方針"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2
@@ -19454,7 +19454,7 @@ msgstr "偏好設定..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
 #, fuzzy
-msgid "Custom Policies..."
+msgid "Policies..."
 msgstr "預設方針..."
 
 #: ../src/addins/MacPlatform/MacPlatform.cs:42
diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
index 90c042f2e2..0744e08040 100644
--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
@@ -226,26 +226,26 @@
 		         type="array" />

 		<Command id = "MonoDevelop.AspNet.Commands.AspNetCommands.AddController"

 		         _label = "Controller..."

+		         _displayName = "Add Controller..."

 		         _description = "Add an ASP.NET MVC controller" />

 		<Command id = "MonoDevelop.AspNet.Commands.AspNetCommands.AddView"

 		         _label = "View..."

+		         _displayName = "Add View..."

 		         _description = "Add an ASP.NET MVC view" />

-		</Category>

-	</Extension>

-

-	<Extension path = "/MonoDevelop/Ide/Commands/TextEditor">

 		<Command id = "MonoDevelop.AspNet.Commands.AspNetCommands.GoToView"

-				_label = "Go To View"

+				_label = "Go to View"

 				defaultHandler = "MonoDevelop.AspNet.Commands.GoToViewCommandHandler"

 				description = "Go to the corresponding view file" />

 		<Command id = "MonoDevelop.AspNet.Commands.AspNetCommands.AddViewFromController"

 				_label = "Add View..."

+				_displayName = "Add View from Controller..."

 				defaultHandler = "MonoDevelop.AspNet.Commands.AddViewFromControllerCommandHandler"

 				description = "Add an ASP.NET MVC view" />

 		<Command id = "MonoDevelop.AspNet.Commands.AspNetCommands.GoToController"

-				_label = "Go To Controller"

+				_label = "Go to Controller"

 				defaultHandler = "MonoDevelop.AspNet.Commands.GoToControllerCommandHandler"

 				description = "Go to the corresponding controller file" />

+		</Category>

 	</Extension>

 

 	<Extension path = "/MonoDevelop/Ide/ContextMenu/ProjectPad/Add">

diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
index 05b702f6a0..48866323e5 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
+++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
@@ -8,28 +8,40 @@
 	<!-- Extensions -->
 
 	<Extension path = "/MonoDevelop/Ide/Commands">
+		<Category _name = "Edit" id="Edit">
+			
 		<Command id = "MonoDevelop.CodeGeneration.CodeGenerationCommands.ShowCodeGenerationWindow"
-				_label = "S_how Code Generation Window"
+				_label = "Show Code _Generation"
 				shortcut = "Alt|Insert"
 				macShortcut = "Meta|I" />
+		</Category>
+
+		<Category _name = "Code Navigation" id = "CodeNavigation">
+			
 		<Command id = "MonoDevelop.CSharp.Refactoring.FindProjectReferenceUsages"
 			defaultHandler = "MonoDevelop.CSharp.Refactoring.FindProjectReferenceUsagesHandler"
-			_label = "_Find reference usages"/>
+			_label = "_Find Reference Usages"/>
 		<Command id = "MonoDevelop.CSharp.Navigation.FindExtensionMethods"
 			defaultHandler = "MonoDevelop.CSharp.Navigation.FindExtensionMethodsHandler"
-			_label = "Extension Methods"/>
+			_label = "Extension Methods"
+			_displayName = "Find Extension Methods"/>
 		<Command id = "MonoDevelop.Refactoring.Navigation.FindBaseSymbols"
 			defaultHandler = "MonoDevelop.CSharp.Navigation.FindBaseSymbolsHandler"
-			_label = "Base Symbols"/>
+			_label = "Base Symbols"
+			_displayName = "Find Base Symbols"/>
 		<Command id = "MonoDevelop.Refactoring.Navigation.FindDerivedSymbols"
 			defaultHandler = "MonoDevelop.CSharp.Refactoring.FindDerivedSymbolsHandler"
-			_label = "Derived Symbols"/>
+			_label = "Derived Symbols"
+			_displayName = "Find Derived Symbols"/>
 		<Command id = "MonoDevelop.CSharp.Navigation.FindMemberOverloads"
 			defaultHandler = "MonoDevelop.CSharp.Navigation.FindMemberOverloadsHandler"
-			_label = "Member Overloads"/>
+			_label = "Member Overloads"
+			_displayName = "Find Member Overloads"/>
 		<Command id = "MonoDevelop.CSharp.Navigation.FindImplementingMembers"
 			defaultHandler = "MonoDevelop.CSharp.Navigation.FindImplementingMembersHandler"
-			_label = "Implementing Members"/>
+			_label = "Implementing Members"
+			_displayName = "Find Implementing Members"/>
+		</Category>
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Commands/Refactoring">
@@ -56,7 +68,8 @@
 		/>
 		<Command id = "MonoDevelop.CSharp.Refactoring.SortAndRemoveImportsCommand"
 			defaultHandler = "MonoDevelop.CSharp.Refactoring.SortAndRemoveImportsCommandHandler"
-			_label = "R_emove and Sort" 
+			_label = "R_emove and Sort"
+			_displayName = "Remove Unused and Sort (Usings)"
 		/>
 	</Extension>
 
diff --git a/main/src/addins/MacPlatform/MacIntegrationCommands.cs b/main/src/addins/MacPlatform/MacIntegrationCommands.cs
index 046fd91843..74f42bb874 100644
--- a/main/src/addins/MacPlatform/MacIntegrationCommands.cs
+++ b/main/src/addins/MacPlatform/MacIntegrationCommands.cs
@@ -26,6 +26,7 @@
 
 using MonoDevelop.Ide;
 using MonoDevelop.Components.Commands;
+using MonoDevelop.MacInterop;
 using AppKit;
 using System.Linq;
 
@@ -94,4 +95,13 @@ namespace MonoDevelop.MacIntegration
 			info.Enabled = NSWorkspace.SharedWorkspace.RunningApplications.Any (a => a.Hidden);
 		}
 	}
+
+	class MacZoomWindowHandler : CommandHandler
+	{
+		protected override void Run ()
+		{
+			NSWindow w = GtkQuartz.GetWindow (IdeApp.Workbench.RootWindow);
+			w.PerformZoom (w);
+		}
+	}
 }
diff --git a/main/src/addins/MacPlatform/MacMenu/MDMenu.cs b/main/src/addins/MacPlatform/MacMenu/MDMenu.cs
index 2b9f8baa6b..7fd72c222d 100644
--- a/main/src/addins/MacPlatform/MacMenu/MDMenu.cs
+++ b/main/src/addins/MacPlatform/MacMenu/MDMenu.cs
@@ -52,6 +52,8 @@ namespace MonoDevelop.MacIntegration.MacMenu
 			foreach (CommandEntry ce in ces) {
 				if (ce.CommandId == Command.Separator) {
 					AddItem (NSMenuItem.SeparatorItem);
+					if (!string.IsNullOrEmpty (ce.OverrideLabel))
+						AddItem (new MDMenuHeaderItem (ce.OverrideLabel));
 					continue;
 				}
 
diff --git a/main/src/addins/MacPlatform/MacMenu/MDMenuHeaderItem.cs b/main/src/addins/MacPlatform/MacMenu/MDMenuHeaderItem.cs
new file mode 100644
index 0000000000..0fc249912d
--- /dev/null
+++ b/main/src/addins/MacPlatform/MacMenu/MDMenuHeaderItem.cs
@@ -0,0 +1,45 @@
+//
+// MDMenuHeaderItem.cs
+//
+// Author:
+//       Vsevolod Kukol <sevoku@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using AppKit;
+
+namespace MonoDevelop.MacIntegration.MacMenu
+{
+	class MDMenuHeaderItem : NSMenuItem, IUpdatableMenuItem
+	{
+		public MDMenuHeaderItem (string text)
+		{
+			Title = text;
+			Enabled = false;
+			Hidden = false;
+		}
+
+		public void Update (MDMenu parent, ref NSMenuItem lastSeparator, ref int index)
+		{
+			MDMenu.ShowLastSeparator (ref lastSeparator);
+		}
+	}
+}
+
diff --git a/main/src/addins/MacPlatform/MacMenu/MDMenuItem.cs b/main/src/addins/MacPlatform/MacMenu/MDMenuItem.cs
index caa93f33ee..90f3f98d5c 100644
--- a/main/src/addins/MacPlatform/MacMenu/MDMenuItem.cs
+++ b/main/src/addins/MacPlatform/MacMenu/MDMenuItem.cs
@@ -32,6 +32,8 @@ using System.Text;
 using Foundation;
 using ObjCRuntime;
 using System.Collections.Generic;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Navigation;
 
 namespace MonoDevelop.MacIntegration.MacMenu
 {
@@ -91,7 +93,7 @@ namespace MonoDevelop.MacIntegration.MacMenu
 			var info = manager.GetCommandInfo (ce.CommandId, new CommandTargetRoute (initialCommandTarget));
 
 			if (!isArrayItem) {
-				SetItemValues (this, info, ce.DisabledVisible);
+				SetItemValues (this, info, ce.DisabledVisible, ce.OverrideLabel);
 				if (!Hidden)
 					MDMenu.ShowLastSeparator (ref lastSeparator);
 				return;
@@ -128,6 +130,7 @@ namespace MonoDevelop.MacIntegration.MacMenu
 						parent.InsertItem (n, index);
 					else
 						parent.AddItem (n);
+					index++;
 					continue;
 				}
 
@@ -161,11 +164,9 @@ namespace MonoDevelop.MacIntegration.MacMenu
 			public CommandInfo Info;
 		}
 
-		void SetItemValues (NSMenuItem item, CommandInfo info, bool disabledVisible)
+		void SetItemValues (NSMenuItem item, CommandInfo info, bool disabledVisible, string overrideLabel = null)
 		{
-			item.SetTitleWithMnemonic (GetCleanCommandText (info));
-			if (!string.IsNullOrEmpty (info.Description) && item.ToolTip != info.Description)
-				item.ToolTip = info.Description;
+			item.SetTitleWithMnemonic (GetCleanCommandText (info, overrideLabel));
 
 			bool enabled = info.Enabled && (!IsGloballyDisabled || commandSource == CommandSource.ContextMenu);
 			bool visible = info.Visible && (disabledVisible || info.Enabled);
@@ -173,6 +174,47 @@ namespace MonoDevelop.MacIntegration.MacMenu
 			item.Enabled = enabled;
 			item.Hidden = !visible;
 
+			string fileName = null;
+			var doc = info.DataItem as Ide.Gui.Document;
+			if (doc != null) {
+				if (doc.IsFile)
+					fileName = doc.FileName;
+				else {
+					// Designer documents have no file bound to them, but the document name
+					// could be a valid path
+					var docName = doc.Name;
+					if (!string.IsNullOrEmpty (docName) && System.IO.Path.IsPathRooted (docName) && System.IO.File.Exists (docName))
+						fileName = docName;
+				}
+			} else if (info.DataItem is NavigationHistoryItem) {
+					var navDoc = ((NavigationHistoryItem)info.DataItem).NavigationPoint as DocumentNavigationPoint;
+					if (navDoc != null)
+						fileName = navDoc.FileName;
+			} else {
+				var str = info.DataItem as string;
+				if (str != null && System.IO.Path.IsPathRooted (str) && System.IO.File.Exists (str))
+					fileName = str;
+			}
+
+			if (!String.IsNullOrWhiteSpace (fileName)) {
+				item.ToolTip = fileName;
+				Xwt.Drawing.Image icon = null;
+				if (!info.Icon.IsNull)
+					icon = Ide.ImageService.GetIcon (info.Icon, Gtk.IconSize.Menu);
+				if (icon == null)
+					icon = Ide.DesktopService.GetIconForFile (fileName, Gtk.IconSize.Menu);
+				if (icon != null) {
+					var scale = GtkWorkarounds.GetScaleFactor (Ide.IdeApp.Workbench.RootWindow);
+
+					if (NSUserDefaults.StandardUserDefaults.StringForKey ("AppleInterfaceStyle") == "Dark")
+						icon = icon.WithStyles ("dark");
+					else
+						icon = icon.WithStyles ("-dark");
+					item.Image = icon.ToBitmap (scale).ToNSImage ();
+					item.Image.Template = true;
+				}
+			}
+
 			SetAccel (item, info.AccelKey);
 
 			if (info.Checked) {
@@ -248,9 +290,9 @@ namespace MonoDevelop.MacIntegration.MacMenu
 			return "";
 		}
 
-		static string GetCleanCommandText (CommandInfo ci)
+		static string GetCleanCommandText (CommandInfo ci, string overrideLabel = null)
 		{
-			string txt = ci.Text;
+			string txt = overrideLabel ?? ci.Text;
 			if (txt == null)
 				return "";
 
diff --git a/main/src/addins/MacPlatform/MacMenu/MDSubMenuItem.cs b/main/src/addins/MacPlatform/MacMenu/MDSubMenuItem.cs
index d733881d2c..da6d084334 100644
--- a/main/src/addins/MacPlatform/MacMenu/MDSubMenuItem.cs
+++ b/main/src/addins/MacPlatform/MacMenu/MDSubMenuItem.cs
@@ -44,10 +44,11 @@ namespace MonoDevelop.MacIntegration.MacMenu
 
 		public void Update (MDMenu parent, ref NSMenuItem lastSeparator, ref int index)
 		{
-			if (ces.AutoHide) {
-				((MDMenu)Submenu).UpdateCommands ();
+			((MDMenu)Submenu).UpdateCommands ();
+			if (ces.AutoHide)
 				Hidden = Submenu.ItemArray ().All (item => item.Hidden);
-			}
+			else
+				Enabled = Submenu.ItemArray ().Any (item => !item.Hidden);
 			if (!Hidden) {
 				MDMenu.ShowLastSeparator (ref lastSeparator);
 			}
diff --git a/main/src/addins/MacPlatform/MacPlatform.addin.xml b/main/src/addins/MacPlatform/MacPlatform.addin.xml
index 5a068cb1b6..72a1fc3287 100644
--- a/main/src/addins/MacPlatform/MacPlatform.addin.xml
+++ b/main/src/addins/MacPlatform/MacPlatform.addin.xml
@@ -17,8 +17,12 @@
 			<Command id  = "MonoDevelop.MacIntegration.MacIntegrationCommands.MinimizeWindow"
 					defaultHandler = "MonoDevelop.MacIntegration.MacMinimizeWindowHandler"
 					_label = "_Minimize"
-					_description = "Minimize the window"
+					_description = "Minimize the Window"
 					macShortcut = "Meta|M" />
+			<Command id  = "MonoDevelop.MacIntegration.MacIntegrationCommands.ZoomWindow"
+					defaultHandler = "MonoDevelop.MacIntegration.MacZoomWindowHandler"
+					_label = "_Zoom"
+					_description = "Zoom the Window"/>
 			<Command id  = "MonoDevelop.MacIntegration.MacIntegrationCommands.HideWindow"
 					defaultHandler = "MonoDevelop.MacIntegration.MacHideWindowHandler"
 					_label = "_Hide Application"
@@ -43,7 +47,9 @@
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Window">
 		<Condition id = "Platform" value = "mac">
 			<CommandItem id = "MonoDevelop.MacIntegration.MacIntegrationCommands.MinimizeWindow"
-			             insertbefore = "MonoDevelop.Ide.Commands.WindowCommands.NextWindow" />
+			             insertafter = "NxtPrvSeparator" />
+			<CommandItem id = "MonoDevelop.MacIntegration.MacIntegrationCommands.ZoomWindow" />
+			<SeparatorItem id = "winMinimizeSep" />
 		</Condition>
 	</Extension>
 	
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 42b96b206d..01594d5ec8 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -270,7 +270,7 @@ namespace MonoDevelop.MacIntegration
 
 			//mac-ify these command names
 			commandManager.GetCommand (EditCommands.MonodevelopPreferences).Text = GettextCatalog.GetString ("Preferences...");
-			commandManager.GetCommand (EditCommands.DefaultPolicies).Text = GettextCatalog.GetString ("Custom Policies...");
+			commandManager.GetCommand (EditCommands.DefaultPolicies).Text = GettextCatalog.GetString ("Policies...");
 			commandManager.GetCommand (HelpCommands.About).Text = GetAboutCommandText ();
 			commandManager.GetCommand (MacIntegrationCommands.HideWindow).Text = GetHideWindowCommandText ();
 			commandManager.GetCommand (ToolCommands.AddinManager).Text = GettextCatalog.GetString ("Add-ins...");
diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj
index 7835211c03..378b140fa3 100644
--- a/main/src/addins/MacPlatform/MacPlatform.csproj
+++ b/main/src/addins/MacPlatform/MacPlatform.csproj
@@ -122,6 +122,7 @@
     <Compile Include="MacInterop\AppleEvents\Native.cs" />
     <Compile Include="MacMenu\MDLinkMenuItem.cs" />
     <Compile Include="MacMenu\MDMenu.cs" />
+    <Compile Include="MacMenu\MDMenuHeaderItem.cs" />
     <Compile Include="MacMenu\MDMenuItem.cs" />
     <Compile Include="MacMenu\MDServicesMenuItem.cs" />
     <Compile Include="MacMenu\MDSubMenuItem.cs" />
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
index bac89c2f85..66cea4d74a 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
@@ -12,7 +12,7 @@
 
 	<!-- Extensions -->
 
-	<Extension path = "/MonoDevelop/Ide/Commands">
+	<Extension path = "/MonoDevelop/Ide/Commands/Tools">
 		<Command id = "MonoDevelop.AssemblyBrowser.ShowAssemblyBrowser"
 		         defaultHandler = "MonoDevelop.AssemblyBrowser.AssemblyBrowserHandler"
 		         _label = "_Assembly Browser" />
@@ -27,8 +27,8 @@
 		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/MainMenu/View">
-		<CommandItem id = "MonoDevelop.AssemblyBrowser.ShowAssemblyBrowser" insertbefore="ViewSeparator3" />
+	<Extension path = "/MonoDevelop/Ide/MainMenu/Tools">
+		<CommandItem id = "MonoDevelop.AssemblyBrowser.ShowAssemblyBrowser" insertafter="ToolsSection" />
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/AssemblyBrowser/EditorContextMenu">
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
index 806bbfd00f..26766083bf 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
@@ -29,13 +29,13 @@
 		<ExtensionNode name="Type" />
 	</ExtensionPoint>
 	<Extension path = "/MonoDevelop/Ide/Pads">
-		<Category id="Debug" _name="Debug Windows">
-			<Pad id = "MonoDevelop.Debugger.BreakpointPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-breakpoints" class = "MonoDevelop.Debugger.BreakpointPad" _label="Breakpoints" />
-			<Pad id = "MonoDevelop.Debugger.LocalsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-locals" class = "MonoDevelop.Debugger.LocalsPad" _label="Locals" />
-			<Pad id = "MonoDevelop.Debugger.WatchPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-watch" class = "MonoDevelop.Debugger.WatchPad" _label="Watch" />
-			<Pad id = "MonoDevelop.Debugger.ImmediatePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.StackTracePad/Center Bottom" icon="md-view-debug-immediate" class = "MonoDevelop.Debugger.ImmediatePad" _label="Immediate" />
+		<Category id="Debug" _name="Debug Pads">
+			<Pad id = "MonoDevelop.Debugger.BreakpointPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-breakpoints" class = "MonoDevelop.Debugger.BreakpointPad" _label="Breakpoints" group="main"/>
+			<Pad id = "MonoDevelop.Debugger.LocalsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-locals" class = "MonoDevelop.Debugger.LocalsPad" _label="Locals"  group="main"/>
+			<Pad id = "MonoDevelop.Debugger.WatchPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-watch" class = "MonoDevelop.Debugger.WatchPad" _label="Watch"  group="main"/>
+			<Pad id = "MonoDevelop.Debugger.ImmediatePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.StackTracePad/Center Bottom" icon="md-view-debug-immediate" class = "MonoDevelop.Debugger.ImmediatePad" _label="Immediate"/>
 			<Pad id = "MonoDevelop.Debugger.StackTracePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.WatchPad/Right Bottom" icon="md-view-debug-call-stack" class = "MonoDevelop.Debugger.StackTracePad" _label="Call Stack" />
-			<Pad id = "MonoDevelop.Debugger.ThreadsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-threads" class = "MonoDevelop.Debugger.ThreadsPad" _label="Threads" />
+			<Pad id = "MonoDevelop.Debugger.ThreadsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-threads" class = "MonoDevelop.Debugger.ThreadsPad" _label="Threads"  group="main"/>
 		</Category>
 	</Extension>
 
@@ -65,7 +65,8 @@
 				defaultHandler = "MonoDevelop.Debugger.DebugEntryHandler"
 				icon = "md-bug"
 				_description = "Debug current project"
-				_label = "Start D_ebugging Item" />
+				_label = "Start D_ebugging Item"
+				_displayName = "Start Debugging (Current Project)" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">
@@ -190,10 +191,6 @@
 		</Category>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/MainMenu/View">
-		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ShowDisassembly" insertafter="MonoDevelop.Ide.Commands.ViewCommands.ViewList"/>
-	</Extension>
-
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Run">
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.Debug" insertafter="MonoDevelop.Ide.Commands.ProjectCommands.Run"/>
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.Pause" insertafter="MonoDevelop.Ide.Commands.ProjectCommands.Stop"/>
@@ -217,6 +214,7 @@
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.DisableAllBreakpoints" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ClearAllBreakpoints" />
 		<SeparatorItem id = "MonoDevelop.Debugger.ToolsSection" />
+		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ShowDisassembly"/>
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator" />
 	</Extension>
 
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
index da0c3b2c3f..79e44b12f0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
@@ -41,6 +41,7 @@
 			class = "MonoDevelop.DesignerSupport.ToolboxPad"
 			_label="Toolbox"
 			icon = "md-toolbox-pad"
+			group = "Designer"
 			defaultLayout="*"
 			defaultPlacement="Right"
 			defaultStatus="AutoHide"
@@ -49,6 +50,7 @@
 			class = "MonoDevelop.DesignerSupport.PropertyPad"
 			_label="Properties"
 			icon = "md-properties-pad"
+			group = "Designer"
 			defaultLayout="*"
 			defaultPlacement="MonoDevelop.DesignerSupport.ToolboxPad/bottom; right"
 			defaultStatus="AutoHide"
@@ -57,6 +59,7 @@
 			class = "MonoDevelop.DesignerSupport.DocumentOutlinePad"
 			_label="Document Outline"
 			icon="md-pad-document-outline"
+			group = "Designer"
 			defaultLayout="*"
 			defaultPlacement="MonoDevelop.DesignerSupport.PropertyPad/center; bottom"
 			defaultStatus="AutoHide"
@@ -93,15 +96,18 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">
+		<Category _name = "Designer" id = "Designer">
 		<Command id = "MonoDevelop.DesignerSupport.Commands.SelectItems"
 				defaultHandler = "MonoDevelop.DesignerSupport.SelectItemsCommandHandler"
-				_label = "Add Items..." />
+				_label = "Add Items..."
+				_displayName = "Add Toolbox Items..." />
 		<Command id = "MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles"
 		         _label = "Switch between related files "
 		         _description = "Switch between related files, such as CodeBehind, headers, etc."
 		         defaultHandler="MonoDevelop.DesignerSupport.SwitchBetweenRelatedFilesCommand"
 		         shortcut="Control|Alt|Up"
 		         macShortcut="Control|Meta|Up" />
+		</Category>
 	</Extension>
 
 	<Extension path="/MonoDevelop/Ide/ContextMenu/DocumentTab">
diff --git a/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml b/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
index 7178a45275..3d202c480a 100644
--- a/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
+++ b/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
@@ -10,7 +10,8 @@
 		         _label = "Document this" /> -->
 		<Command id = "MonoDevelop.DocFood.Commands.DocumentBuffer"
 		         defaultHandler = "MonoDevelop.DocFood.DocumentBufferHandler"
-		         _label = "Document Buffer" />
+		         _label = "Documentation _Comments"
+		         _displayName = "Insert Documentation Comments" />
 	</Extension>
 	
 
@@ -19,7 +20,7 @@
 	</Extension>
 
 
-	<Extension path = "/MonoDevelop/Ide/MainMenu/Edit">
+	<Extension path = "/MonoDevelop/Ide/MainMenu/Edit/Insert">
 <!--		<CommandItem id="MonoDevelop.DocFood.Commands.DocumentThis" /> -->
 		<CommandItem id="MonoDevelop.DocFood.Commands.DocumentBuffer" insertafter = "MonoDevelop.Ide.Commands.EditCommands.InsertStandardHeader"/>
 	</Extension>
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
index 3132051581..4c42bffbb9 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
@@ -57,7 +57,7 @@
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Ide/Commands">
-		<Category _name = "Gtk# Designer" id = "GtkCore">
+		<Category _name = "Designer (Gtk#)" id = "GtkCore">
 		<Command id = "MonoDevelop.GtkCore.GtkCommands.AddNewDialog"
 				icon = "md-gtkcore-dialog"
 				_label = "New Dialog..." />
@@ -75,7 +75,7 @@
 		<Command id = "MonoDevelop.GtkCore.GtkCommands.EditIcons"
 				_label = "Edit Project Icons..." />
 		<Command id = "MonoDevelop.GtkCore.GtkCommands.GtkSettings"
-				_label = "GTK# support settings..." />
+				_label = "GTK# Support Settings..." />
 		</Category>
 	</Extension>
 	
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
index caa93c4622..51e4058a60 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
@@ -9,58 +9,62 @@
 	<Extension path = "/MonoDevelop/Ide/Commands">

 		<Category _name = "NuGet" id = "NuGet">

 		<Command

-			id = "MonoDevelop.PackageManagement.Commands.AddNuGetPackages"

+			id = "MonoDevelop.PackageManagement.Commands.AddPackages"

 			_description = "Add NuGet packages to the project"

 			_label = "Add NuGet _Packages..."

 			defaultHandler = "MonoDevelop.PackageManagement.Commands.AddPackagesHandler" />

 		<Command

-			id = "MonoDevelop.PackageManagement.Commands.AddPackages"

-			_description = "Add packages to the project"

-			_label = "Add _Packages..."

-			defaultHandler = "MonoDevelop.PackageManagement.Commands.AddPackagesHandler" />

-		<Command

 			id = "MonoDevelop.PackageManagement.Commands.RestorePackages"

-			_description = "Restore missing NuGet packages"

+			_description = "Restore all missing packages in the solution"

 			_label = "_Restore NuGet Packages"

+			_displayName = "Restore Packages (Solution)"

 			defaultHandler = "MonoDevelop.PackageManagement.Commands.RestorePackagesHandler" />

 		<Command

 			id="MonoDevelop.PackageManagement.Commands.Restore"

 			_description="Restore missing packages"

 			_label="_Restore"

+			_displayName = "Restore Packages"

 			defaultHandler="MonoDevelop.PackageManagement.Commands.RestorePackagesInProjectHandler" />

 		<Command

-			id="MonoDevelop.PackageManagement.Commands.PackageReferenceNodeCommands.ShowPackageVersion"

-			_description="Current package version"

-			_label="Version" />

-		<Command

 			id="MonoDevelop.PackageManagement.Commands.PackageReferenceNodeCommands.ReinstallPackage"

-			_description="Retarget package"

-			_label="Re_target" />

+			_description="Retarget selected package"

+			_label="Re_target"

+			_displayName="Retartget Package" />

 		<Command

 			id="MonoDevelop.PackageManagement.Commands.PackageReferenceNodeCommands.UpdatePackage"

-			_description="Update package"

-			_label="_Update" />

+			_description="Update selected package"

+			_label="_Update"

+			_displayName="Update Package" />

 		<Command

 			id="MonoDevelop.PackageManagement.Commands.UpdateAllPackagesInProject"

 			_description="Update all packages"

 			_label="_Update"

+			_displayName="Update All Packages"

 			defaultHandler="MonoDevelop.PackageManagement.Commands.UpdateAllPackagesInProjectHandler" />

 		<Command

 			id="MonoDevelop.PackageManagement.Commands.UpdateAllPackagesInSolution"

-			_description="Update all NuGet packages in the solution"

+			_description="Update all packages in the solution"

 			_label="_Update NuGet Packages"

+			_displayName="Update All Packages (Solution)"

 			defaultHandler="MonoDevelop.PackageManagement.Commands.UpdateAllPackagesInSolutionHandler" />

 		<Command

 			id="MonoDevelop.PackageManagement.Commands.ReinstallAllPackagesInProject"

 			_description="Retargets all packages"

 			_label="Re_target"

+			_displayName="Retartget All Packages"

 			defaultHandler="MonoDevelop.PackageManagement.Commands.ReinstallAllPackagesInProjectHandler" />

 		</Category>

+		<Category id="Hidden" _name="Hidden">

+			<Command

+				id="MonoDevelop.PackageManagement.Commands.PackageReferenceNodeCommands.ShowPackageVersion"

+				_description="Current package version"

+				_label="Version" />

+		</Category>

 	</Extension>

 	

 	<Extension path="/MonoDevelop/Ide/MainMenu/Project">

 		<SeparatorItem insertafter="MonoDevelop.Ide.Commands.ProjectCommands.AddReference" />

-		<CommandItem id="MonoDevelop.PackageManagement.Commands.AddNuGetPackages" />

+		<CommandItem id="MonoDevelop.PackageManagement.Commands.AddPackages" />

 		<CommandItem id="MonoDevelop.PackageManagement.Commands.UpdateAllPackagesInSolution" />

 		<CommandItem id="MonoDevelop.PackageManagement.Commands.RestorePackages" />

 		<SeparatorItem />

@@ -79,7 +83,7 @@
 		</Condition>

 		<Condition id="ItemType" value="MonoDevelop.PackageManagement.NodeBuilders.ProjectPackagesFolderNode">

 			<CommandItem

-				id="MonoDevelop.PackageManagement.Commands.AddPackages" />

+				id="MonoDevelop.PackageManagement.Commands.AddPackages" _label = "Add _Packages..." />

 			<CommandItem

 				id="MonoDevelop.PackageManagement.Commands.ReinstallAllPackagesInProject" />

 			<CommandItem

@@ -92,7 +96,7 @@
 	<Extension path="/MonoDevelop/Ide/ContextMenu/ProjectPad/Add">

 		<Condition id="ItemType" value="Project">

 			<CommandItem

-				id="MonoDevelop.PackageManagement.Commands.AddNuGetPackages"

+				id="MonoDevelop.PackageManagement.Commands.AddPackages"

 				insertafter="MonoDevelop.Ide.Commands.ProjectCommands.AddFiles"

 				insertbefore="MonoDevelop.WebReferences.WebReferenceCommands.Add" />

 		</Condition>

diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
index 80dfdf8a69..768ff0ca92 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
@@ -74,8 +74,6 @@
 					macShortcut = "Shift|Meta|R"/>
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindAllReferences"
 					_label = "_Find References of All Overloads" />
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses"
-					_label = "Find _Derived Symbols" />
 		</Category>
 		
 		<Category _name = "Refactoring" id = "Refactoring">
@@ -96,6 +94,11 @@
 					_description = "Generates an HTML file that contains a list of all code rules"
 					/>
 		</Category>
+
+		<Category id="Hidden" _name="Hidden">
+		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses"
+					_label = "Find _Derived Symbols" />
+		</Category>
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
@@ -104,7 +107,7 @@
 	
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Edit">
 		<CommandItem id = "MonoDevelop.CodeGeneration.CodeGenerationCommands.ShowCodeGenerationWindow"
-		             insertafter="MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeTemplateWindow" />
+		             insertafter="MonoDevelop.Ide.Commands.TextEditorCommands.ShowParameterCompletionWindow" />
 	</Extension>
 	
 	<!-- Quick fix commands -->
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.addin.xml b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.addin.xml
index 228bf1151f..ea6da8a825 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.addin.xml
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.addin.xml
@@ -2,14 +2,14 @@
 
 	<!-- Extensions -->
 	
-	<Extension path = "/MonoDevelop/Ide/Commands">
+	<Extension path = "/MonoDevelop/Ide/Commands/Tools">
 		<Command id = "MonoDevelop.RegexToolkit.Commands.ShowRegexToolkit"
 		         defaultHandler = "MonoDevelop.RegexToolkit.ShowRegexToolkitHandler"
-		         _label = "_Regex Toolkit..." />
+		         _label = "_Regular Expressions Toolkit" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Tools">
-		<CommandItem id = "MonoDevelop.RegexToolkit.Commands.ShowRegexToolkit" insertbefore="OptionsSection" />
+		<CommandItem id = "MonoDevelop.RegexToolkit.Commands.ShowRegexToolkit" insertafter= "ToolsSection" />
 	</Extension>
 
 </ExtensionModel>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
index 86d2a271bc..14f76b0032 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
@@ -42,6 +42,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			insertParenthesesCheckbutton.Toggled += InsertParensToggled;
 			autoCodeCompletionCheckbutton.Toggled += AutomaticCompletionToggled;
 			includeKeywordsCheckbutton.Visible = includeCodeSnippetsCheckbutton.Visible = false;
+			suggestionModeHbox.Sensitive = false;
 			hbox4.Visible = hbox5.Visible = false;
 
 		}
@@ -63,6 +64,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			showImportsCheckbutton.Active = IdeApp.Preferences.AddImportedItemsToCompletionList;
 			includeKeywordsCheckbutton.Active = IdeApp.Preferences.IncludeKeywordsInCompletionList;
 			includeCodeSnippetsCheckbutton.Active = IdeApp.Preferences.IncludeCodeSnippetsInCompletionList;
+			completeOnEnterRadiobutton.Active = IdeApp.Preferences.ForceSuggestionMode;
 
 			insertParenthesesCheckbutton.Active = IdeApp.Preferences.AddParenthesesAfterCompletion;
 			openingRadiobutton.Active = IdeApp.Preferences.AddOpeningOnly;
@@ -76,6 +78,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		void AutomaticCompletionToggled (object sender, EventArgs e)
 		{
 			includeKeywordsCheckbutton.Sensitive = includeCodeSnippetsCheckbutton.Sensitive = !autoCodeCompletionCheckbutton.Active;
+			suggestionModeHbox.Sensitive = autoCodeCompletionCheckbutton.Active;
 		}
 
 		bool IOptionsPanel.IsVisible ()
@@ -94,6 +97,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			IdeApp.Preferences.AddImportedItemsToCompletionList.Value = showImportsCheckbutton.Active;
 			IdeApp.Preferences.IncludeKeywordsInCompletionList.Value = includeKeywordsCheckbutton.Active;
 			IdeApp.Preferences.IncludeCodeSnippetsInCompletionList.Value = includeCodeSnippetsCheckbutton.Active;
+			IdeApp.Preferences.ForceSuggestionMode.Value = completeOnEnterRadiobutton.Active;
 
 			IdeApp.Preferences.AddParenthesesAfterCompletion.Value = insertParenthesesCheckbutton.Active;
 			IdeApp.Preferences.AddOpeningOnly.Value = openingRadiobutton.Active;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
index 112f02c8fb..669e11f65d 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
@@ -73,7 +73,7 @@
 		</Category>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/Commands/TextEditor">
+	<Extension path = "/MonoDevelop/Ide/Commands/Hidden">
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.Top"
 				_label = "_Top"/>
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.Bottom"
@@ -82,6 +82,9 @@
 				_label = "_Page Up"/>
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.PgDown"
 				_label = "P_age Down"/>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/Commands/TextEditor">
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.ShowTasks"
 				_label = "Show _Tasks"
 				type="radio"/>
@@ -152,10 +155,11 @@
 
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Search">
 		<ItemSet id = "Inspect" _label = "Inspect" insertafter="MonoDevelop.Ide.Commands.ViewCommands.ShowNext" insertbefore="Separator3">
-			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.NextIssue" />
-			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.PrevIssue" />
-			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.NextIssueError" />
 			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.PrevIssueError" />
+			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.NextIssueError" />
+			<SeparatorItem id = "InspectIssueSeparator" />
+			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.PrevIssue" />
+			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.NextIssue" />
 		</ItemSet>
 	</Extension>
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
index 22f824fa80..7b83c1a4a4 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
@@ -759,6 +759,18 @@ namespace MonoDevelop.SourceEditor
 			RunAction (ScrollActions.PageDown);
 		}
 
+		[CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.ScrollTop)]
+		internal void OnScrollTop ()
+		{
+			RunAction (ScrollActions.Top);
+		}
+
+		[CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.ScrollBottom)]
+		internal void OnScrollBottom ()
+		{
+			RunAction (ScrollActions.Bottom);
+		}
+
 		[CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.GotoMatchingBrace)]
 		internal void OnGotoMatchingBrace ()
 		{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
index 2676db7750..9187b78d7c 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
@@ -12,6 +12,16 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 		private global::Gtk.CheckButton autoCodeCompletionCheckbutton;
 
+		private global::Gtk.Alignment alignment1;
+
+		private global::Gtk.HBox suggestionModeHbox;
+
+		private global::Gtk.Label label1;
+
+		private global::Gtk.RadioButton completeOnAllRadiobutton;
+
+		private global::Gtk.RadioButton completeOnEnterRadiobutton;
+
 		private global::Gtk.HBox hbox4;
 
 		private global::Gtk.Fixed fixed3;
@@ -71,6 +81,50 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
+			this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
+			this.alignment1.Name = "alignment1";
+			this.alignment1.LeftPadding = ((uint)(24));
+			// Container child alignment1.Gtk.Container+ContainerChild
+			this.suggestionModeHbox = new global::Gtk.HBox();
+			this.suggestionModeHbox.Name = "suggestionModeHbox";
+			this.suggestionModeHbox.Spacing = 6;
+			// Container child suggestionModeHbox.Gtk.Box+BoxChild
+			this.label1 = new global::Gtk.Label();
+			this.label1.Name = "label1";
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Complete after typing:");
+			this.suggestionModeHbox.Add(this.label1);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.suggestionModeHbox[this.label1]));
+			w2.Position = 0;
+			w2.Expand = false;
+			// Container child suggestionModeHbox.Gtk.Box+BoxChild
+			this.completeOnAllRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("Enter, Space, Tab, Period"));
+			this.completeOnAllRadiobutton.CanFocus = true;
+			this.completeOnAllRadiobutton.Name = "completeOnAllRadiobutton";
+			this.completeOnAllRadiobutton.DrawIndicator = true;
+			this.completeOnAllRadiobutton.UseUnderline = true;
+			this.completeOnAllRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
+			this.suggestionModeHbox.Add(this.completeOnAllRadiobutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.suggestionModeHbox[this.completeOnAllRadiobutton]));
+			w3.Position = 1;
+			w3.Expand = false;
+			// Container child suggestionModeHbox.Gtk.Box+BoxChild
+			this.completeOnEnterRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("Enter only"));
+			this.completeOnEnterRadiobutton.CanFocus = true;
+			this.completeOnEnterRadiobutton.Name = "completeOnEnterRadiobutton";
+			this.completeOnEnterRadiobutton.DrawIndicator = true;
+			this.completeOnEnterRadiobutton.UseUnderline = true;
+			this.completeOnEnterRadiobutton.Group = this.completeOnAllRadiobutton.Group;
+			this.suggestionModeHbox.Add(this.completeOnEnterRadiobutton);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.suggestionModeHbox[this.completeOnEnterRadiobutton]));
+			w4.Position = 2;
+			w4.Expand = false;
+			this.alignment1.Add(this.suggestionModeHbox);
+			this.vbox5.Add(this.alignment1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment1]));
+			w6.Position = 1;
+			w6.Expand = false;
+			w6.Fill = false;
+			// Container child vbox5.Gtk.Box+BoxChild
 			this.hbox4 = new global::Gtk.HBox();
 			this.hbox4.Name = "hbox4";
 			this.hbox4.Spacing = 6;
@@ -79,10 +133,10 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.fixed3.Name = "fixed3";
 			this.fixed3.HasWindow = false;
 			this.hbox4.Add(this.fixed3);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.fixed3]));
-			w2.Position = 0;
-			w2.Expand = false;
-			w2.Padding = ((uint)(6));
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.fixed3]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Padding = ((uint)(6));
 			// Container child hbox4.Gtk.Box+BoxChild
 			this.includeKeywordsCheckbutton = new global::Gtk.CheckButton();
 			this.includeKeywordsCheckbutton.CanFocus = true;
@@ -91,13 +145,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.includeKeywordsCheckbutton.DrawIndicator = true;
 			this.includeKeywordsCheckbutton.UseUnderline = true;
 			this.hbox4.Add(this.includeKeywordsCheckbutton);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.includeKeywordsCheckbutton]));
-			w3.Position = 1;
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.includeKeywordsCheckbutton]));
+			w8.Position = 1;
 			this.vbox5.Add(this.hbox4);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox4]));
-			w4.Position = 1;
-			w4.Expand = false;
-			w4.Fill = false;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox4]));
+			w9.Position = 2;
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.hbox5 = new global::Gtk.HBox();
 			this.hbox5.Name = "hbox5";
@@ -107,10 +161,10 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.fixed4.Name = "fixed4";
 			this.fixed4.HasWindow = false;
 			this.hbox5.Add(this.fixed4);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.fixed4]));
-			w5.Position = 0;
-			w5.Expand = false;
-			w5.Padding = ((uint)(6));
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.fixed4]));
+			w10.Position = 0;
+			w10.Expand = false;
+			w10.Padding = ((uint)(6));
 			// Container child hbox5.Gtk.Box+BoxChild
 			this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton();
 			this.includeCodeSnippetsCheckbutton.CanFocus = true;
@@ -119,13 +173,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.includeCodeSnippetsCheckbutton.DrawIndicator = true;
 			this.includeCodeSnippetsCheckbutton.UseUnderline = true;
 			this.hbox5.Add(this.includeCodeSnippetsCheckbutton);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.includeCodeSnippetsCheckbutton]));
-			w6.Position = 1;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.includeCodeSnippetsCheckbutton]));
+			w11.Position = 1;
 			this.vbox5.Add(this.hbox5);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox5]));
-			w7.Position = 2;
-			w7.Expand = false;
-			w7.Fill = false;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox5]));
+			w12.Position = 3;
+			w12.Expand = false;
+			w12.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.showImportsCheckbutton = new global::Gtk.CheckButton();
 			this.showImportsCheckbutton.CanFocus = true;
@@ -134,10 +188,10 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.showImportsCheckbutton.DrawIndicator = true;
 			this.showImportsCheckbutton.UseUnderline = true;
 			this.vbox5.Add(this.showImportsCheckbutton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.showImportsCheckbutton]));
-			w8.Position = 3;
-			w8.Expand = false;
-			w8.Fill = false;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.showImportsCheckbutton]));
+			w13.Position = 4;
+			w13.Expand = false;
+			w13.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.insertParenthesesCheckbutton = new global::Gtk.CheckButton();
 			this.insertParenthesesCheckbutton.CanFocus = true;
@@ -146,10 +200,10 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.insertParenthesesCheckbutton.DrawIndicator = true;
 			this.insertParenthesesCheckbutton.UseUnderline = true;
 			this.vbox5.Add(this.insertParenthesesCheckbutton);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.insertParenthesesCheckbutton]));
-			w9.Position = 4;
-			w9.Expand = false;
-			w9.Fill = false;
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.insertParenthesesCheckbutton]));
+			w14.Position = 5;
+			w14.Expand = false;
+			w14.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
@@ -159,26 +213,25 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.fixed1.Name = "fixed1";
 			this.fixed1.HasWindow = false;
 			this.hbox2.Add(this.fixed1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
-			w10.Position = 0;
-			w10.Expand = false;
-			w10.Padding = ((uint)(6));
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
+			w15.Position = 0;
+			w15.Expand = false;
+			w15.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.openingRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Opening only"));
 			this.openingRadiobutton.CanFocus = true;
 			this.openingRadiobutton.Name = "openingRadiobutton";
-			this.openingRadiobutton.Active = true;
 			this.openingRadiobutton.DrawIndicator = true;
 			this.openingRadiobutton.UseUnderline = true;
 			this.openingRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
 			this.hbox2.Add(this.openingRadiobutton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.openingRadiobutton]));
-			w11.Position = 1;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.openingRadiobutton]));
+			w16.Position = 1;
 			this.vbox5.Add(this.hbox2);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
-			w12.Position = 5;
-			w12.Expand = false;
-			w12.Fill = false;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
+			w17.Position = 6;
+			w17.Expand = false;
+			w17.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
@@ -188,10 +241,10 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
 			this.hbox3.Add(this.fixed2);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
-			w13.Position = 0;
-			w13.Expand = false;
-			w13.Padding = ((uint)(6));
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
+			w18.Position = 0;
+			w18.Expand = false;
+			w18.Padding = ((uint)(6));
 			// Container child hbox3.Gtk.Box+BoxChild
 			this.bothRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Both opening and closing"));
 			this.bothRadiobutton.CanFocus = true;
@@ -200,19 +253,19 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.bothRadiobutton.UseUnderline = true;
 			this.bothRadiobutton.Group = this.openingRadiobutton.Group;
 			this.hbox3.Add(this.bothRadiobutton);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.bothRadiobutton]));
-			w14.Position = 1;
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.bothRadiobutton]));
+			w19.Position = 1;
 			this.vbox5.Add(this.hbox3);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
-			w15.Position = 6;
-			w15.Expand = false;
-			w15.Fill = false;
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
+			w20.Position = 7;
+			w20.Expand = false;
+			w20.Fill = false;
 			this.alignment3.Add(this.vbox5);
 			this.vbox1.Add(this.alignment3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
-			w17.Position = 0;
-			w17.Expand = false;
-			w17.Fill = false;
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
+			w22.Position = 0;
+			w22.Expand = false;
+			w22.Fill = false;
 			this.Add(this.vbox1);
 			if ((this.Child != null))
 			{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
index 1146b7c21a..10ba238c90 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
@@ -2137,7 +2137,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel" design-size="345 291">
+  <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel" design-size="428 291">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <property name="GeneratePublic">False</property>
@@ -2170,6 +2170,68 @@
                   </packing>
                 </child>
                 <child>
+                  <widget class="Gtk.Alignment" id="alignment1">
+                    <property name="MemberName" />
+                    <property name="LeftPadding">24</property>
+                    <child>
+                      <widget class="Gtk.HBox" id="suggestionModeHbox">
+                        <property name="MemberName" />
+                        <property name="Spacing">6</property>
+                        <child>
+                          <widget class="Gtk.Label" id="label1">
+                            <property name="MemberName" />
+                            <property name="LabelProp" translatable="yes">Complete after typing:</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">False</property>
+                            <property name="Expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.RadioButton" id="completeOnAllRadiobutton">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">Enter, Space, Tab, Period</property>
+                            <property name="Active">True</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                            <property name="Group">suggestionModeGroup</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">False</property>
+                            <property name="Expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.RadioButton" id="completeOnEnterRadiobutton">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">Enter only</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                            <property name="Group">suggestionModeGroup</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">2</property>
+                            <property name="AutoSize">False</property>
+                            <property name="Expand">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
                   <widget class="Gtk.HBox" id="hbox4">
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
@@ -2201,7 +2263,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">1</property>
+                    <property name="Position">2</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
@@ -2239,7 +2301,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">2</property>
+                    <property name="Position">3</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
@@ -2255,7 +2317,7 @@
                     <property name="UseUnderline">True</property>
                   </widget>
                   <packing>
-                    <property name="Position">3</property>
+                    <property name="Position">4</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
@@ -2271,7 +2333,7 @@
                     <property name="UseUnderline">True</property>
                   </widget>
                   <packing>
-                    <property name="Position">4</property>
+                    <property name="Position">5</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
@@ -2311,7 +2373,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">5</property>
+                    <property name="Position">6</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
@@ -2350,7 +2412,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">6</property>
+                    <property name="Position">7</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml
index 2e4df980c8..4bff618508 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml
@@ -31,12 +31,12 @@
 	<!-- Extensions -->
 
 	<Extension path = "/MonoDevelop/Ide/Pads">
-		<SolutionPad id = "MonoDevelop.UnitTesting.TestPad" defaultLayout="*" defaultPlacement = "Right" defaultStatus="AutoHide" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.UnitTesting.TestPad">
+		<SolutionPad id = "MonoDevelop.UnitTesting.TestPad" defaultLayout="*" defaultPlacement = "Right" defaultStatus="AutoHide" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.UnitTesting.TestPad" group="Unit Testing">
 			<PadOption id = "ShowTestTime" _label = "Show Test Time" defaultValue = "False" />
 			<PadOption id = "ShowTestCounters" _label = "Show Test Counters" defaultValue = "False" />
 			<NodeBuilder id = "TestNode" class = "MonoDevelop.UnitTesting.TestNodeBuilder"/>
 		</SolutionPad>
-		<Pad id="MonoDevelop.UnitTesting.TestResultsPad" _label="Test Results" icon="nunit-pad-icon" class="MonoDevelop.UnitTesting.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/>
+		<Pad id="MonoDevelop.UnitTesting.TestResultsPad" _label="Test Results" icon="nunit-pad-icon" class="MonoDevelop.UnitTesting.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"  group="Unit Testing"/>
 	</Extension>
 
 	<Extension path="/MonoDevelop/Ide/WorkbenchLayouts">
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
index ac436f5c45..11f861310e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
@@ -175,23 +175,25 @@
 			icon = "vc-diff"
 			description = "Create a patch representing local changes."/>
 		<Command id = "MonoDevelop.VersionControl.Commands.Ignore"
-			_label = "Add to ignore list"
+			_label = "Add to Ignore List"
 			description = "Add items to version control ignore list"/>
 		<Command id = "MonoDevelop.VersionControl.Commands.Unignore"
-			_label = "Remove from ignore list"
+			_label = "Remove from Ignore List"
 			description = "Removes items to version control ignore list"/>
 		<Command id = "MonoDevelop.VersionControl.Commands.ResolveConflicts"
 			_label = "Resolve Conflicts"
 			description = "Resolve conflicts on the project file."/>
+		</Category>
 
+		<Category id="Hidden" _name="Hidden">
 		<Command id = "MonoDevelop.VersionControl.Views.BlameCommands.CopyRevision"
-			_label = "_Copy revision"/>
+			_label = "_Copy Revision"/>
 		<Command id = "MonoDevelop.VersionControl.Views.BlameCommands.ShowDiff"
-			_label = "_Show diff"/>
+			_label = "_Show Diff"/>
 		<Command id = "MonoDevelop.VersionControl.Views.BlameCommands.ShowLog"
-			_label = "S_how log"/>
+			_label = "S_how Log"/>
 		<Command id = "MonoDevelop.VersionControl.Views.BlameCommands.ShowBlameBefore"
-			_label = "Show _blame before"/>
+			_label = "Show _Blame Before"/>
 		</Category>
 	</Extension>
 
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
index c579ab60f3..7730917f53 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
@@ -130,17 +130,18 @@ namespace WindowsPlatform.MainToolbar
 

 					int count = 1;

 					int indexOfThis = parent.Items.IndexOf (this);

-					foreach (var child in info.ArrayInfo) {

-						Control toAdd;

-						if (child.IsArraySeparator) {

-							toAdd = new Separator ();

-						} else {

-							toAdd = new TitleMenuItem (manager, menuEntry, child, menu: menu);

+					if (info.ArrayInfo != null)

+						foreach (var child in info.ArrayInfo) {

+							Control toAdd;

+							if (child.IsArraySeparator) {

+								toAdd = new Separator ();

+							} else {

+								toAdd = new TitleMenuItem (manager, menuEntry, child, menu: menu);

+							}

+

+							toRemoveFromParent.Add (toAdd);

+							parent.Items.Insert (indexOfThis + (count++), toAdd);

 						}

-

-						toRemoveFromParent.Add (toAdd);

-						parent.Items.Insert (indexOfThis + (count++), toAdd);

-					}

 					return;

 				}

 			}

diff --git a/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml b/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml
index 106cc52ce7..0d82726115 100644
--- a/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml
+++ b/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml
@@ -70,11 +70,13 @@
 	</Extension>

 

 	<!-- XML menu -->

-	<Extension path = "/MonoDevelop/Ide/MainMenu/Tools">

-		<ItemSet id = "XmlMenu" insertafter = "AddinManagerSeparator" _label = "_XML" >

+	<Extension path = "/MonoDevelop/Ide/MainMenu/Edit">

+		<ItemSet id = "XmlMenu" insertafter = "Insert" _label = "_XML" >

+			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.Validate" />

+			<SeparatorItem id = "Separator1" />

 			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.CreateSchema" />

 			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.GoToSchemaDefinition" />

-			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.Validate" />

+			<SeparatorItem id = "Separator2" />

 			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.AssignStylesheet"/>

 			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.OpenStylesheet"/>

 			<CommandItem id = "MonoDevelop.Xml.Editor.XmlCommands.RunXslTransform"/>

diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ScrollActions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ScrollActions.cs
index ff33d46e09..f0002f0eb9 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ScrollActions.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ScrollActions.cs
@@ -58,6 +58,19 @@ namespace Mono.TextEditor
 			if (data.Parent != null)
 				data.Parent.SmoothScrollTo (newValue);
 		}
+
+		public static void Top (TextEditorData data)
+		{
+			if (data.Parent != null)
+				data.Parent.SmoothScrollTo (data.VAdjustment.Lower);
+		}
+
+		public static void Bottom (TextEditorData data)
+		{
+			var newValue = System.Math.Max (data.VAdjustment.Lower, data.VAdjustment.Upper - data.VAdjustment.PageSize);
+			if (data.Parent != null)
+				data.Parent.SmoothScrollTo (newValue);
+		}
 	}
 	
 }
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.AddIns/BrandingCondition.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.AddIns/BrandingCondition.cs
new file mode 100644
index 0000000000..1db5f5e3b8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.AddIns/BrandingCondition.cs
@@ -0,0 +1,48 @@
+//
+// BrandingCondition.cs
+//
+// Author:
+//       Vsevolod Kukol <sevoku@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.Addins;
+
+namespace MonoDevelop.Core.AddIns
+{
+	public class BrandingCondition: ConditionType
+	{
+		public override bool Evaluate (NodeElement conditionNode)
+		{
+			string appName = conditionNode.GetAttribute ("value");
+			bool negate = false;
+			if (appName.StartsWith ("!", StringComparison.Ordinal)) {
+				appName = appName.Substring (1);
+				negate = true;
+			}
+
+			bool result = BrandingService.ApplicationName.StartsWith (appName, StringComparison.OrdinalIgnoreCase);
+
+			return negate ? !result : result;
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
index 36a30abe46..95b81c4706 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
@@ -5,6 +5,7 @@
 	<ConditionType id="Platform" type="MonoDevelop.Core.AddIns.PlatformCondition" />
 	<ConditionType id="AssemblyInstalled" type="MonoDevelop.Core.AddIns.AssemblyInstalledCondition" />
 	<ConditionType id="MSBuildTargetIsAvailable" type="MonoDevelop.Projects.MSBuild.TargetsAvailableCondition" />
+	<ConditionType id="Branding" type="MonoDevelop.Core.AddIns.BrandingCondition" />
 
 	
 	<!-- Extension points -->
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index a2cabf4d55..00d711ef7e 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -243,6 +243,7 @@
     <Compile Include="MonoDevelop.Core.Logging\RemoteLogger.cs" />
     <Compile Include="MonoDevelop.Core.Instrumentation\TimeCounter.cs" />
     <Compile Include="MonoDevelop.Core.AddIns\PlatformCondition.cs" />
+    <Compile Include="MonoDevelop.Core.AddIns\BrandingCondition.cs" />
     <Compile Include="MonoDevelop.Core.Serialization\BinaryDataSerializer.cs" />
     <Compile Include="MonoDevelop.Core.Execution\LocalConsole.cs" />
     <Compile Include="MonoDevelop.Core\IconId.cs" />
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
index b256f81ff9..c299b3b670 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
@@ -63,7 +63,7 @@
 			defaultHandler = "MonoDevelop.Ide.Commands.DefaultDeleteHandler"
 			icon  = "gtk-delete" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.Rename"
-			_label = "Re_name"
+			_label = "Re_name..."
 			_description = "Rename the selection"
 			shortcut = "F2"
 			macShortcut = "Meta|R"/>
@@ -104,23 +104,27 @@
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.IndentSelection"
 			shortcut = "Control|Alt|End"
 			_description = "Indent selected lines of code"
-			_label = "_Indent Selection"
+			_label = "_Indent"
+			_displayName = "Indent Selection"
 			macShortcut = "Meta|]"
 			icon = "gtk-indent" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.UnIndentSelection"
 			shortcut = "Control|Alt|Home"
 			_description = "Unindent selected lines of code"
 			macShortcut = "Meta|["
-			_label = "_Unindent Selection"
+			_label = "_Unindent"
+			_displayName = "Unindent Selection"
 			icon = "gtk-unindent" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.UppercaseSelection"
 			_description = "Convert the selected text to uppercase"
-			_label = "_Uppercase Selection" />
+			_label = "Upper_case"
+			_displayName = "Uppercase Selection" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.LowercaseSelection"
 			_description = "Convert the selected text to lowercase"
-			_label = "_Lowercase Selection" />
+			_label = "_Lowercase"
+			_displayName = "Lowercase Selection" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.RemoveTrailingWhiteSpaces"
-			description = "Remove trailing whitespace"
+			_description = "Remove trailing whitespace"
 			_label = "_Remove Trailing Whitespace" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.JoinWithNextLine"
 			shortcut = "Control|Shift|J"
@@ -130,8 +134,9 @@
 			_description = "Sort the selected lines"
 			_label = "_Sort Lines" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.InsertGuid"
-			_label = "_Insert Guid"
-			description = "Inserts a Guid at caret position"/>
+			_label = "_GUID (Globally Unique Identifier)"
+			_displayName = "Insert GUID (Globally Unique Identifier)"
+			_description = "Inserts a Guid at caret position"/>
 	<Condition id="Platform" value="windows">
 		<Command id = "MonoDevelop.Ide.Commands.EditCommands.MonodevelopPreferences"
 				defaultHandler = "MonoDevelop.Ide.Commands.MonodevelopPreferencesHandler"
@@ -150,13 +155,17 @@
 	</Condition>
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.DefaultPolicies"
 			defaultHandler = "MonoDevelop.Ide.Commands.DefaultPoliciesHandler"
-			_label = "Custom Po_licies..."
+			_label = "Po_licies..."
 			_description = "Edit custom sets of policies which can be applied to solutions" />
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.InsertStandardHeader"
-			_label = "_Insert Standard Header"
+			_label = "Standard _Header"
+			_displayName = "Insert Standard Header"
 			defaultHandler = "MonoDevelop.Ide.Commands.InsertStandardHeaderHandler"
 			_description = "Add the user defined header to the top of the file"/>
 
+	<Command id = "MonoDevelop.Ide.Commands.EditCommands.EnableDisableFolding"
+			_label = "Enable _Folding"
+			_displayName = "Enable/Disable Code Folding"/>
 	<Command id = "MonoDevelop.Ide.Commands.EditCommands.ToggleFolding"
 			_label = "_Toggle Fold"
 			shortcut = "Control|Shift|M"
@@ -338,7 +347,7 @@
 	<Command id = "MonoDevelop.Ide.Commands.ProjectCommands.ExportSolution"
 			defaultHandler = "MonoDevelop.Ide.Commands.ExportSolutionHandler"
 			_description = "Convert selected solution to another format"
-			_label = "Convert solution format..." />
+			_label = "Convert Solution Format..." />
 	<Command id = "MonoDevelop.Ide.Commands.ProjectCommands.SelectActiveConfiguration"
 			type = "radio|array"
 			defaultHandler = "MonoDevelop.Ide.Commands.SelectActiveConfigurationHandler"
@@ -374,7 +383,7 @@
 			icon  = "gtk-open" />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.NewFile"
 			defaultHandler = "MonoDevelop.Ide.Commands.NewFileHandler"
-			_label = "_File..."
+			_label = "New _File..."
 			shortcut = "Control|N"
 			macShortcut = "Meta|N"
 			_description = "Create a new file"
@@ -394,14 +403,14 @@
 			_label = "Save A_ll" />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.NewProject"
 			defaultHandler = "MonoDevelop.Ide.Commands.NewProjectHandler"
-			_label = "_Solution..."
+			_label = "New _Solution..."
 			icon = "md-new-solution"
 			_description = "Create a new solution"
 			macShortcut = "Meta|Shift|N"
 			shortcut = "Control|Shift|N"  />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.NewWorkspace"
 			defaultHandler = "MonoDevelop.Ide.Commands.NewWorkspaceHandler"
-			_label = "_Workspace..."
+			_label = "New _Workspace..."
 			_description = "Create a new workspace"
 			icon  = "md-new-workspace" />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.CloseFile"
@@ -429,6 +438,7 @@
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.CloseWorkspaceItem"
 			defaultHandler = "MonoDevelop.Ide.Commands.CloseWorkspaceHandler"
 			_label = "C_lose"
+			_displayName = "Close Workspace Item"
 			_description = "Close the active solution or workspace item"
 			icon = "md-close-combine-icon" />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.ReloadFile"
@@ -461,8 +471,9 @@
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.ClearRecentFiles"
 			defaultHandler = "MonoDevelop.Ide.Commands.ClearRecentFilesHandler"
 			_label = "_Clear"
+			_displayName="Clear Recent Files"
 			icon  = "gtk-clear"
-			_description = "Clear recent files" />
+			_description = "Clear recent files list" />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.RecentProjectList"
 			defaultHandler = "MonoDevelop.Ide.Commands.RecentProjectListHandler"
 			type="array"
@@ -470,8 +481,9 @@
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.ClearRecentProjects"
 			defaultHandler = "MonoDevelop.Ide.Commands.ClearRecentProjectsHandler"
 			_label = "_Clear"
+			_displayName="Clear Recent Solutions"
 			icon  = "gtk-clear"
-			_description = "Clear recent solutions" />
+			_description = "Clear recent solutions list" />
 	<Command id = "MonoDevelop.Ide.Commands.FileCommands.Exit"
 			defaultHandler = "MonoDevelop.Ide.Commands.ExitHandler"
 			_label = "_Quit"
@@ -518,9 +530,6 @@
 	         defaultHandler = "MonoDevelop.Ide.Commands.CopyPathNameHandler"
 			_description = "Copy the file path to the clipboard"
 			_label = "C_opy File Path"/>
-	<Command id = "MonoDevelop.Ide.Commands.FileTabCommands.ToggleMaximize"
-	         defaultHandler = "MonoDevelop.Ide.Commands.ToggleMaximizeHandler"
-			_label = "S_witch Maximized/Normal View"/>
 	<Command id = "MonoDevelop.Ide.Commands.FileTabCommands.ReopenClosedTab"
 			defaultHandler = "MonoDevelop.Ide.Commands.ReopenClosedTabHandler"
 			_label = "Reopen Closed Tab"
@@ -540,7 +549,7 @@
 			_label = "Layout List" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.NewLayout"
 			defaultHandler = "MonoDevelop.Ide.Commands.NewLayoutHandler"
-			_label = "_New Layout..."
+			_label = "Save Curre_nt Layout..."
 			icon = "gtk-add"
 			_description = "Create new layout" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.DeleteCurrentLayout"
@@ -559,6 +568,9 @@
 			_label = "_Full Screen"
 			icon = "gtk-fullscreen"
 			_description = "Set full screen mode" />
+	<Command id = "MonoDevelop.Ide.Commands.FileTabCommands.ToggleMaximize"
+	         defaultHandler = "MonoDevelop.Ide.Commands.ToggleMaximizeHandler"
+			_label = "S_witch Maximized/Normal View"/>
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.Open"
 			_description = "Open selected document"
 			_label = "_Open" />
@@ -635,13 +647,15 @@
 			_description = "Resets zoom to default" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.SideBySideMode"
 			defaultHandler = "MonoDevelop.Ide.Commands.SideBySideModeHandler"
-			_label = "2 Columns"
+			_label = "Two Columns"
+			_displayName = "Two Editor Columns"
 			shortcut = "Control|Shift|2"
 			macShortcut = "Alt|Meta|2"
 			icon = "md-columns-two" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.SingleMode"
 			defaultHandler = "MonoDevelop.Ide.Commands.SingleModeHandler"
-			_label = "1 Column"
+			_label = "One Column"
+			_displayName = "One Editor Column"
 			shortcut = "Control|Shift|1"
 			macShortcut = "Alt|Meta|1"
 			icon = "md-columns-one" />
@@ -662,7 +676,8 @@
 			_description = "Focus current document" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.CenterAndFocusCurrentDocument"
 			defaultHandler = "MonoDevelop.Ide.Commands.CenterAndFocusCurrentDocumentHandler"
-			_label = "Center and F_ocus Document"
+			_displayName = "Center and Focus Document"
+			_label = "_Cursor Position"
 			shortcut = "Alt|Shift|C"
 			_description = "Focus and center current document" />
 	<Command id = "MonoDevelop.Ide.Commands.ViewCommands.ShowWelcomePage"
@@ -683,6 +698,9 @@
 			defaultHandler = "MonoDevelop.Ide.Commands.ToolListHandler"
 			type="array"
 			_label = "Tool List" />
+	<Command id = "MonoDevelop.Ide.Commands.ToolCommands.EditCustomTools"
+			defaultHandler = "MonoDevelop.Ide.Commands.EditCustomToolsHandler"
+			_label = "Edit Custom Tools..." />
 
 	<Command id = "MonoDevelop.Ide.Commands.ToolCommands.InstrumentationViewer"
 			defaultHandler = "MonoDevelop.Ide.Commands.InstrumentationViewerHandler"
@@ -768,13 +786,12 @@
 			_description = "Show tip of the day" />
 	<Command id = "MonoDevelop.Ide.Commands.HelpCommands.OpenLogDirectory"
 			defaultHandler = "MonoDevelop.Ide.Commands.OpenLogDirectoryHandler"
-			_label = "Open Log Directory"
+			_label = "Reveal _Logs"
 			icon = "md-open-folder"
 			_description = "Opens the directory where the diagnostic logs are stored" />
 	<Command id = "MonoDevelop.Ide.Commands.HelpCommands.About"
 			defaultHandler = "MonoDevelop.Ide.Commands.AboutHandler"
 			_label = "_About"
-			icon = "md-about"
 			_description = "Show about dialog" />
 	<Command id  = "MonoDevelop.Ide.Updater.UpdateCommands.CheckForUpdates"
 			defaultHandler = "MonoDevelop.Ide.Updater.CheckForUpdatesHandler"
@@ -827,12 +844,12 @@
 			_description = "Search backwards for the same text with emacs behavior"/>
 
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.FindNextSelection"
-			_label = "Find Next Selection"
+			_label = "Find Next Like Selection"
 			_description = "Search forwards for the selected text"
 			shortcut = "Control|F3"
 			macShortcut = "Meta|E" />
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.FindPreviousSelection"
-			_label = "Find _Previous Selection"
+			_label = "Find Previous Like Selection"
 			_description = "Search backwards for the selected text"
 			shortcut = "Shift|Control|F3" />
 
@@ -851,13 +868,15 @@
 
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.GotoType"
 			defaultHandler = "MonoDevelop.Components.MainToolbar.GotoTypeHandler"
-	         _label = "Go to Type..."
+	         _label = "_Type..."
+	         _displayName = "Go to Type..."
 			_description = "Jump to the declaration of type in the current workspace"
 	         shortcut = "Control|Shift|T"
 	         macShortcut = "Meta|Shift|T" />
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.GotoFile"
 			defaultHandler = "MonoDevelop.Components.MainToolbar.GotoFileHandler"
-			_label = "Go to File..."
+			_label = "_File..."
+			_displayName = "Go to File..."
 			shortcut = "Alt|Shift|O"
 			macShortcut = "Meta|Shift|D"
 			_description = "Jump to a file in the current workspace" />
@@ -877,27 +896,30 @@
 			icon = "md-bookmark-prev"
 			shortcut = "Shift|F2"
 			_description = "Go to previous bookmark"
-			_label = "Pre_vious Bookmark" />
+			_label = "Pre_vious"
+			_displayName = "Go to Previous Bookmark" />
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.NextBookmark"
 			icon = "md-bookmark-next"
 			shortcut = "F2"
 			_description = "Go to next bookmark"
-			_label = "Ne_xt Bookmark" />
+			_label = "Ne_xt"
+			_displayName = "Go to Next Bookmark" />
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.ClearBookmarks"
 			icon = "md-bookmark-clear-all"
 			_description = "Clear bookmarks"
 			_label = "_Clear Bookmarks" />
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.GotoLineNumber"
-			_label = "_Go to Line..."
+			_label = "_Line..."
+			_displayName = "Go to Line..."
 			icon = "md-go-to-line"
 			_description = "Go to a specific line"
 			shortcut = "Control|I"
 			macShortcut = "Meta|L" />
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.UseSelectionForFind"
-			_label = "Use Selection for Find"
+			_label = "Find Like Selection"
 			_description = "Uses the current selection as find string"/>
 	<Command id = "MonoDevelop.Ide.Commands.SearchCommands.UseSelectionForReplace"
-			_label = "Use Selection for Replace"
+			_label = "Replace Like Selection"
 			_description = "Uses the current selection as replace string"/>
 	</Category>
 
@@ -907,7 +929,7 @@
 	<Category _name = "Text Editor" id = "TextEditor">
 
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCompletionWindow"
-			_label = "Show Completion Window"
+			_label = "Show Code Completion"
 			macShortcut="Control|space"
 			shortcut = "Control|space" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ToggleCompletionSuggestionMode"
@@ -915,7 +937,12 @@
 			_label = "Toggle Completion Suggestion Mode" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeTemplateWindow"
 			_description="Inserts a template or when something is selected surrounds selection with a template"
-			_label = "I_nsert Template..."/>
+			_label = "_Template..."
+			_displayName = "Insert Template..."/>
+	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeSurroundingsWindow"
+			_description="Surrounds selection with a template when something is selected"
+			_label = "_Surround With..."
+			_displayName = "Surround Selection With..."/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.LineEnd"
 			_label = "Go to end of line" macShortcut = "Meta+Right"/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.LineStart"
@@ -950,6 +977,10 @@
 			_label = "Scroll page up"/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ScrollPageDown"
 			_label = "Scroll page down"/>
+	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ScrollTop"
+			_label = "Scroll to top"/>
+	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.ScrollBottom"
+			_label = "Scroll to bottom"/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.DeleteLine"
 			_label = "Delete entire line" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.DeleteToLineStart"
@@ -972,9 +1003,10 @@
 			macShortcut = "Control|Shift|space"
 			shortcut = "Control|Shift|space" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.GotoMatchingBrace"
-			_label = "Go to Matching _Brace"
+			_label = "Matching _Brace"
+			_displayName = "Go to Matching Brace"
 			icon = "md-go-to-matching-brace"
-			description = "Go to Matching Brace"
+			_description = "Go to Matching Brace"
 			shortcut = "Control|B" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.SelectionMoveLeft"
 			_label = "Expand selection to the left" />
@@ -1016,7 +1048,7 @@
 	         _label = "_Expand selection" shortcut = "Alt|Shift|Down" macShortcut = "Alt|Shift|Down"/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.SwitchCaretMode"
 			_label = "Switch caret mode"
-			description = "Switch between insert and overwrite caret modes"/>
+			_description = "Switch between insert and overwrite caret modes"/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.InsertTab"
 			_label = "Insert tab" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.RemoveTab"
@@ -1029,7 +1061,8 @@
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.InsertNewLineAtEnd"
 			_label = "Move caret to EOL and insert new line" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.CompleteStatement"
-			_label = "Completes the current statement"
+			_label = "Complete current statement"
+			_description = "Completes the current statement"
 			shortcut = "Control|Shift|Return" />
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.DeletePrevWord"
 			_label = "Delete previous word" />
@@ -1068,15 +1101,20 @@
 			macShortcut = "Meta||" />
 			
 	<Command id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle"
-			_label = "Toggle message bubble"
-			_description = "Toggles message bubble on/off"/>
+			disabledVisible = "false"
+			_label = "Hide Current Message"
+			_displayName = "Show/Hide current Inline Message"
+			_description = "Toggles the visibility of the current Inline Message"/>
 	<Command id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.HideIssues"
 			defaultHandler = "MonoDevelop.Ide.Editor.HideIssuesHandler"
-			_label = "_Hide Issues"/>
+			_label = "_None"
+			_displayName = "Show/Hide Inline Messages"
+			_description = "Toggles the visibility of Inline Messages"
+			type="radio"/>
 	<Command id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.ToggleIssues"
 			defaultHandler = "MonoDevelop.Ide.Editor.ToggleIssuesHandler"
 			_label = "Toggle Issues"
-			type="array"/>
+			type="radio|array"/>
 	</Category>
 </Extension>
 </ExtensionModel>
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
index 9383f6237a..7fd4e4c7bf 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
@@ -17,34 +17,32 @@
 
 <Extension path = "/MonoDevelop/Ide/MainMenu">
 	<ItemSet id = "File" _label = "_File">
-		<ItemSet id = "New" _label = "_New">
-			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.NewFile" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.NewProject" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.NewWorkspace" />
-		</ItemSet>
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.NewFile" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.NewProject" />
+		<SeparatorItem id = "NewSep" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.OpenFile" />
-
 		<SeparatorItem id = "OpenSep" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.Save" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAs" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAll" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.ReloadFile" />
-		<SeparatorItem id = "SaveSeparator" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPreviewDocument" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" />
-		<SeparatorItem id = "RecentSeparator" />
+
 		<ItemSet id = "RecentFiles" _label = "Recent _Files">
 			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.RecentFileList" />
 			<SeparatorItem id = "RecentFilesSeparator" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.ClearRecentFiles" />
 		</ItemSet>
-                
 		<ItemSet id = "RecentProjects" _label = "Recent Solu_tions">
 			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.RecentProjectList" />
 			<SeparatorItem id = "RecentProjectsSeparator" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.ClearRecentProjects" />
 		</ItemSet>
+		<SeparatorItem id = "RecentSeparator" />
+
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.Save" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAs" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAll" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.ReloadFile" />
+		<SeparatorItem id = "SaveSeparator" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPreviewDocument" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" />
 		
 		<SeparatorItem id = "ExitSeparator" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.CloseWorkspace" />
@@ -63,42 +61,40 @@
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Paste" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Rename" />
 
 		<SeparatorItem id = "Separator2" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.SelectAll" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeSurroundingsWindow" />
 		
 		<SeparatorItem id = "Separator4" />
 		
 		<ItemSet id = "Format" _label = "_Format">
 			<CommandItem id = "MonoDevelop.Ide.CodeFormatting.CodeFormattingCommands.FormatBuffer" />
-			<SeparatorItem id ="FormatSeparator" /> 
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.UppercaseSelection" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.LowercaseSelection" />
-			<SeparatorItem id = "Separator1" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.ToggleCodeComment" />
+			<SeparatorItem id ="FormatSeparator" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.IndentSelection" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.UnIndentSelection" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.RemoveTrailingWhiteSpaces" />
+			<SeparatorItem id = "Separator1" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.UppercaseSelection" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.LowercaseSelection" />
 			<SeparatorItem id = "Separator2" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.ToggleCodeComment" />
+			<SeparatorItem id = "Separator3" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.JoinWithNextLine" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.SortSelectedLines" />
-		</ItemSet>
-
-		<ItemSet id = "Folding" _label = "F_olding">
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.ToggleFolding" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.ToggleAllFoldings" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.FoldDefinitions" />
+			<SeparatorItem id = "Separator4" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.RemoveTrailingWhiteSpaces" />
 		</ItemSet>
 		
+		<ItemSet id = "Insert" _label = "_Insert">
+			<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeTemplateWindow" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.InsertStandardHeader" />
+			<SeparatorItem id = "InsertSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.InsertGuid" />
+		</ItemSet>
+		<SeparatorItem id = "Separator5" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCompletionWindow" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ToggleCompletionSuggestionMode" />
-		
 		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowParameterCompletionWindow" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeTemplateWindow" />
-		<SeparatorItem id = "Separator5" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.InsertStandardHeader" />
-		<SeparatorItem id = "Separator6" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.ToggleBlockSelectionMode" />
 		<SeparatorItem id = "optionssep5" />
 		<Condition id="Platform" value="linux">
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.MonodevelopPreferences" />
@@ -107,30 +103,38 @@
 	</ItemSet>
 	
 	<ItemSet id = "View" _label = "_View">
+		<SeparatorItem _label = "Layout"/>
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.LayoutList" />
 		<SeparatorItem id = "ViewSeparator1" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ViewList" />
+		<SeparatorItem id = "ViewSeparator2" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.NewLayout" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.DeleteCurrentLayout" />
-		<SeparatorItem id = "ViewSeparator2" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ViewList" />
-		<ItemSet id = "MessageBubbles" _label = "_Message Bubbles">
-			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle" />
+		<SeparatorItem id = "ViewSeparator3" />
+		<ItemSet id = "Editor Columns">
+			<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.SingleMode" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.SideBySideMode" />
+		</ItemSet>
+		<ItemSet id = "MessageBubbles" _label = "Inline _Messages">
 			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.HideIssues" />
-			<SeparatorItem id = "Separator1" />
 			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.ToggleIssues" />
+			<SeparatorItem id = "Separator1" />
+			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle" />
 		</ItemSet>
-		<SeparatorItem id = "ViewSeparator3" />
+		<ItemSet id = "Folding" _label = "F_olding">
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.EnableDisableFolding" />
+			<SeparatorItem id = "FoldingSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.ToggleFolding" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.ToggleAllFoldings" />
+			<SeparatorItem id = "FoldDefinitionsSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.FoldDefinitions" />
+		</ItemSet>
+		<SeparatorItem id = "ViewSeparator4" />
 		<SeparatorItem id = "ViewItemsSeparator" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ZoomIn" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ZoomOut" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ZoomReset" />
 		<SeparatorItem id = "ViewItemsSeparator4" />
-		<ItemSet id = "Editor Layout">
-			<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.SingleMode" />
-			<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.SideBySideMode" />
-		</ItemSet>
-		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.FocusCurrentDocument" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowWelcomePage" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.FullScreen" />
 	
 	</ItemSet>
@@ -138,44 +142,50 @@
 	<ItemSet id = "Search" _label = "_Search">
 	
 		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.Find" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.Replace" />
+		<SeparatorItem id = "SearchSeparator1" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.FindPrevious" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.FindNext" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.FindNextSelection" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.Replace" />
 	
-		<SeparatorItem id = "SearchSeparator" />
+		<SeparatorItem id = "SearchSeparator2" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.FindInFiles" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.ReplaceInFiles" />
 		
 		<SeparatorItem id = "SearchInFilesSeparator" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.ToggleBookmark" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.PrevBookmark" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.NextBookmark" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.ClearBookmarks" />
+		<ItemSet id = "Bookmarks" >
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.ToggleBookmark" />
+			<SeparatorItem id = "BookmarksNavigationSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.PrevBookmark" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.NextBookmark" />
+			<SeparatorItem id = "BookmarksClearSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.ClearBookmarks" />
+		</ItemSet>
+		<ItemSet id = "Go To" >
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.GotoFile" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.GotoType" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.GotoLineNumber" />
+			<SeparatorItem id = "GoToSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.CenterAndFocusCurrentDocument" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.GotoMatchingBrace" />
+		</ItemSet>
 		<SeparatorItem id = "Separator2" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.GotoLineNumber" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.GotoFile" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.SearchCommands.GotoType" />
-		<CommandItem id = "MonoDevelop.Components.MainToolbar.Commands.NavigateTo" />
-		
-		<SeparatorItem id = "ViewItemsSeparator3" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.NavigationCommands.NavigateBack" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.NavigationCommands.NavigateForward" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowPrevious" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowNext" />
+		<SeparatorItem id = "Separator3" />
 		<ItemSet id = "NavigationList" _label = "Navigation _History"
 		         _description = "Select a point from the navigation history" >
+			<CommandItem id = "MonoDevelop.Ide.Commands.NavigationCommands.NavigateBack" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.NavigationCommands.NavigateForward" />
+			<SeparatorItem id = "NavigationHistorySeparator" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.NavigationCommands.NavigateHistory" />
 			<SeparatorItem id = "NavigationHistoryClearSeparator" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.NavigationCommands.ClearNavigationHistory" />
 		</ItemSet>
-		<SeparatorItem id = "ViewItemsSeparator4" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowPrevious" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowNext" />
-		<SeparatorItem id = "Separator3" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.TextEditorCommands.GotoMatchingBrace" />
+		<CommandItem id = "MonoDevelop.Components.MainToolbar.Commands.NavigateTo" />
 	</ItemSet>
 
 	<ItemSet id = "Project" _label = "_Project">
-		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.ExportSolution" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.AddReference" />
 		<SeparatorItem id = "ExportSeparator" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.CustomCommandList" />
@@ -196,6 +206,8 @@
 		<SeparatorItem id = "OptionsSeparator" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.SolutionOptions" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.ProjectOptions" />
+		<SeparatorItem id = "ProjectToolsSeparator" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.ExportSolution" />
 	</ItemSet>
 
 	<ItemSet id = "Build" _label = "_Build">
@@ -223,14 +235,14 @@
 		<Condition id="Platform" value="!mac">
 			<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.AddinManager" />
 		</Condition>
-		<SeparatorItem id ="AddinManagerSeparator" /> 
-		<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ToolList" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.InstrumentationViewer" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.InsertGuid" />
+		<SeparatorItem id ="ToolsSection" /> 
 		<ItemSet id = "SessionRecorder" _label = "Session Recorder" autohide = "true">
 			<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ToggleSessionRecorder" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ReplaySession" />
 		</ItemSet>
+		<SeparatorItem id = "CustomToolsSection" _label = "Custom"/>
+		<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.ToolList" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.EditCustomTools" />
 		<SeparatorItem id = "OptionsSection" />
 		<Condition id="Platform" value="windows">
 			<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.MonodevelopPreferences" />
@@ -252,31 +264,29 @@
 		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.OpenWindowList" />
 		<SeparatorItem id = "windowDocSep" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.WindowCommands.OpenDocumentList" />
-		<SeparatorItem id = "docMinimizeSep" />
+		<SeparatorItem id = "welcomePageSep" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowWelcomePage" />
 	</ItemSet> 
 
 	<ItemSet id = "Help" _label = "_Help">
 		<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.Help" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.TipOfTheDay" />
+		<!--<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.TipOfTheDay" />-->
 		<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.SendFeedback" />
-		<Condition id = "Platform" value = "!mac">
-			<CommandItem id = "MonoDevelop.Ide.Updater.UpdateCommands.CheckForUpdates" />
-		</Condition>
-		<SeparatorItem id = "Separator2" />
-		<ItemSet id = "Web" _label = "_Web">
+		<SeparatorItem id = "LinksSeparator" />
+		<Condition id = "Branding" value = "MonoDevelop">
 			<LinkItem id = "MonoDevelop" _label = "MonoDevelop" link = "http://www.monodevelop.com" />
 			<LinkItem id = "Mono" _label = "Mono Project" description = "A free .NET implementation effort, worth visiting" link = "http://www.mono-project.com" />
-			<ItemSet id = "C#" _label = "C#">
-				<LinkItem id = "C# Help" _label = "C# Help" link = "http://www.csharphelp.com" />
-				<LinkItem id = "C# Corner" _label = "C# Corner" link = "http://www.c-sharpcorner.com" />
-				<LinkItem id = "CodePlex" _label = "CodePlex" description = "Open Source Project Community." link = "http://www.codeplex.com" />
-				<LinkItem id = "MsCodeGallery" _label = "MSDN Code Gallery" description = "Download and share sample applications, code snippets, and other resources with the developer community." link = "http://code.msdn.microsoft.com" />
-			</ItemSet>
-		</ItemSet>
+		</Condition>
 		<SeparatorItem id = "Separator3" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.OpenLogDirectory" />
-		<LinkItem id = "ReportBug" _label = "Report a Bug" link = "http://xamar.in/r/file_studio_bug" />
+		<ItemSet id = "Diagnostics">
+			<LinkItem id = "ReportBug" _label = "Report Problem..." link = "http://xamar.in/r/file_studio_bug" />
+			<SeparatorItem id = "DiagnosticToolsSeparator" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.OpenLogDirectory" />
+			<CommandItem id = "MonoDevelop.Ide.Commands.ToolCommands.InstrumentationViewer" />
+		</ItemSet>
 		<Condition id = "Platform" value = "!mac">
+			<SeparatorItem id = "SeparatorAbout" />
+			<CommandItem id = "MonoDevelop.Ide.Updater.UpdateCommands.CheckForUpdates" />
 			<CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.About" />
 		</Condition>
 	</ItemSet>
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml
index 294d0dd946..c10e84970c 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml
@@ -24,6 +24,7 @@
 	<Pad id = "MonoDevelop.Ide.Gui.Pads.ErrorListPad"
 		_label = "Errors"
 		icon="md-errors-list"
+		group="Logs"
 		class = "MonoDevelop.Ide.Gui.Pads.ErrorListPad"
 		defaultPlacement = "Bottom"
 		defaultStatus="AutoHide"
@@ -32,6 +33,7 @@
 	<Pad id = "MonoDevelop.Ide.Gui.Pads.TaskListPad"
 		_label = "Tasks"
 		icon="md-task-list"
+		group="Logs"
 		class = "MonoDevelop.Ide.Gui.Pads.TaskListPad"
 		defaultPlacement = "Bottom"
 		defaultStatus="AutoHide"
@@ -41,9 +43,10 @@
 		defaultPlacement = "Left"
 		_label = "Help"
 		icon="md-help-pad"
+		group="ZHelp"
 		class = "MonoDevelop.Ide.Gui.Pads.HelpTree"/>
 
-	<SolutionPad id = "ProjectPad" _label = "Solution" icon = "md-solution-pad" class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.ProjectSolutionPad" defaultLayout="*" defaultPlacement = "Left">
+	<SolutionPad id = "ProjectPad" _label = "Solution" icon = "md-solution-pad" class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.ProjectSolutionPad" defaultLayout="*" defaultPlacement = "Left" group="1Solution">
 		<ContextMenu path="/MonoDevelop/Ide/ContextMenu/ProjectPad" />
 		<PadOption id = "ShowAllFiles" _label = "Show All Files" defaultValue = "False" />
 		<NodeBuilder class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.WorkspaceNodeBuilder"/>
@@ -63,7 +66,7 @@
 		<NodeBuilder class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.ImplicitFrameworkAssemblyReferenceNodeBuilder"/>
 	</SolutionPad>
 	
-	<SolutionPad id = "ClassPad" _label = "Classes" icon = "md-classes-pad" class = "MonoDevelop.Ide.Gui.Pads.ClassBrowser.ClassBrowserPad" defaultPlacement = "Left" defaultStatus="AutoHide">
+	<SolutionPad id = "ClassPad" _label = "Classes" icon = "md-classes-pad" class = "MonoDevelop.Ide.Gui.Pads.ClassBrowser.ClassBrowserPad" defaultPlacement = "Left" defaultStatus="AutoHide" group="1Solution">
 		<PadOption id = "NestedNamespaces" _label = "Nested namespaces" defaultValue = "True" />
 		<PadOption id = "ShowProjects" _label = "Show project structure" defaultValue = "True" />
 		<PadOption id = "GroupByAccess" _label = "Group members by access" defaultValue = "False" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/CommandCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/CommandCodon.cs
index 4a3f6fe307..60b8d6e247 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/CommandCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/CommandCodon.cs
@@ -44,6 +44,9 @@ namespace MonoDevelop.Components.Commands.ExtensionNodes
 	{
 		[NodeAttribute ("_label", true, "Label", Localizable=true)]
 		string label;
+
+		[NodeAttribute ("_displayName", "Display Name of the command, visible in search results or key bindings option panel.", Localizable = true)]
+		string _displayName;
 		
 		[NodeAttribute ("_description", "Description of the command", Localizable=true)]
 		string _description;
@@ -148,6 +151,8 @@ namespace MonoDevelop.Components.Commands.ExtensionNodes
 			
 			cmd.Id = ParseCommandId (this);
 			cmd.Text = StringParserService.Parse (BrandingService.BrandApplicationName (label));
+			if (!String.IsNullOrWhiteSpace(_displayName))
+				cmd.DisplayName = StringParserService.Parse (BrandingService.BrandApplicationName (_displayName));
 			if ((_description != null) && (_description.Length > 0)){
 				cmd.Description = BrandingService.BrandApplicationName (_description);				
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/SeparatorItemCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/SeparatorItemCodon.cs
index c19e9fac86..28154e9f25 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/SeparatorItemCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/SeparatorItemCodon.cs
@@ -40,9 +40,12 @@ namespace MonoDevelop.Components.Commands.ExtensionNodes
 	[ExtensionNode (Description="A separator menu or toolbar item")]
 	internal class SeparatorItemCodon : InstanceExtensionNode
 	{
+		[NodeAttribute ("_label", "Label of the item.", Localizable = true)]
+		string label;
+
 		public override object CreateInstance ()
 		{
-			return new CommandEntry (Command.Separator);
+			return new CommandEntry (Command.Separator, label);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/Command.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/Command.cs
index 9a0a69b78d..d43d95149b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/Command.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/Command.cs
@@ -39,6 +39,7 @@ namespace MonoDevelop.Components.Commands
 		
 		object id;
 		string text;
+		string displayName;
 		string description;
 		IconId icon;
 		string accelKey;
@@ -133,6 +134,11 @@ namespace MonoDevelop.Components.Commands
 			get { return disabledVisible; }
 			set { disabledVisible = value; }
 		}
+
+		public string DisplayName {
+			get { return String.IsNullOrWhiteSpace (displayName) ? text.Replace ("_", String.Empty) : displayName; }
+			set { displayName = value; }
+		}
 		
 		public string Description {
 			get { return description; }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandEntry.cs
index b908b5078f..5c41cd976c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandEntry.cs
@@ -76,6 +76,11 @@ namespace MonoDevelop.Components.Commands
 			set { disabledVisible = value; }
 		}
 
+		public string OverrideLabel {
+			get { return overrideLabel; }
+			set { overrideLabel = value; }
+		}
+
 		public CommandEntryDisplayType DisplayType {
 			get;
 			set;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/CommandSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/CommandSearchCategory.cs
index bd2f9c96fb..1ed6108fa4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/CommandSearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/CommandSearchCategory.cs
@@ -48,7 +48,7 @@ namespace MonoDevelop.Components.MainToolbar
 		static CommandSearchCategory ()
 		{
 			allCommands = IdeApp.CommandService.GetCommands ().Select(cmd =>
-				Tuple.Create (cmd, cmd.Text.Replace ("_", ""))
+				Tuple.Create (cmd, cmd.DisplayName)
 			).ToList();
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs
index bd15e84f84..ffb221645b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs
@@ -92,7 +92,7 @@ namespace MonoDevelop.Components.Mac
 			var info = manager.GetCommandInfo (ce.CommandId, new CommandTargetRoute (initialCommandTarget));
 
 			if (!isArrayItem) {
-				SetItemValues (this, info, ce.DisabledVisible);
+				SetItemValues (this, info, ce.DisabledVisible, ce.OverrideLabel);
 				if (!Hidden)
 					MDMenu.ShowLastSeparator (ref lastSeparator);
 				return;
@@ -129,6 +129,7 @@ namespace MonoDevelop.Components.Mac
 						parent.InsertItem (n, index);
 					else
 						parent.AddItem (n);
+					index++;
 					continue;
 				}
 
@@ -162,9 +163,9 @@ namespace MonoDevelop.Components.Mac
 			public CommandInfo Info;
 		}
 
-		void SetItemValues (NSMenuItem item, CommandInfo info, bool disabledVisible)
+		void SetItemValues (NSMenuItem item, CommandInfo info, bool disabledVisible, string overrideLabel = null)
 		{
-			item.SetTitleWithMnemonic (GetCleanCommandText (info));
+			item.SetTitleWithMnemonic (GetCleanCommandText (info, overrideLabel));
 			if (!string.IsNullOrEmpty (info.Description) && item.ToolTip != info.Description)
 				item.ToolTip = info.Description;
 
@@ -249,9 +250,9 @@ namespace MonoDevelop.Components.Mac
 			return "";
 		}
 
-		static string GetCleanCommandText (CommandInfo ci)
+		static string GetCleanCommandText (CommandInfo ci, string overrideLabel = null)
 		{
-			string txt = ci.Text;
+			string txt = overrideLabel ?? ci.Text;
 			if (txt == null)
 				return "";
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs
index d8abe37a83..66a3d52aef 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs
@@ -56,6 +56,9 @@ namespace MonoDevelop.Ide.Codons
 		
 		[NodeAttribute("icon", "Icon of the pad. It can be a stock icon or a resource icon (use 'res:' as prefix in the last case).")]
 		string icon = null;
+
+		[NodeAttribute ("group", "Name of the group, used to group Pads inside Category menus.")]
+		string group = null;
 		
 		[NodeAttribute("defaultPlacement",
 		               "Default placement of the pad inside the workbench. " +
@@ -106,6 +109,10 @@ namespace MonoDevelop.Ide.Codons
 		public IconId Icon {
 			get { return !string.IsNullOrEmpty (icon) ? icon : "md-generic-pad"; }
 		}
+
+		public string Group {
+			get { return !string.IsNullOrEmpty (group) ? group : "YOther"; }
+		}
 		
 		public string ClassName {
 			get { return className; }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
index 22211b010e..3d0523c9b1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
@@ -60,6 +60,7 @@ namespace MonoDevelop.Ide.Commands
 		DefaultPolicies,
 		InsertStandardHeader,
 		
+		EnableDisableFolding,
 		ToggleFolding,
 		ToggleAllFoldings,
 		FoldDefinitions,
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs
index f05ad1f3ba..b7a21a1ced 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs
@@ -34,6 +34,7 @@ namespace MonoDevelop.Ide.Commands
 	{
 		ShowCompletionWindow,
 		ShowCodeTemplateWindow,
+		ShowCodeSurroundingsWindow,
 		LineEnd,
 		LineStart,
 		DeleteLeftChar,
@@ -50,6 +51,8 @@ namespace MonoDevelop.Ide.Commands
 		ScrollLineDown,
 		ScrollPageUp,
 		ScrollPageDown,
+		ScrollTop,
+		ScrollBottom,
 		DeleteLine,
 		DeleteToLineStart,
 		DeleteToLineEnd,
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
index 6f22f4170a..b51601453c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ToolsCommands.cs
@@ -43,6 +43,7 @@ namespace MonoDevelop.Ide.Commands
 		InstrumentationViewer,
 		ToggleSessionRecorder,
 		ReplaySession,
+		EditCustomTools,
 	}
 
 	internal class AddinManagerHandler : CommandHandler
@@ -67,6 +68,8 @@ namespace MonoDevelop.Ide.Commands
 				info.Add (commandInfo, externalTool);
 
 			}
+			if (info.Count > 0)
+				info.AddSeparator ();
 		}
 
 		protected override void Run (object dataItem)
@@ -129,6 +132,19 @@ namespace MonoDevelop.Ide.Commands
 		}
 	}
 
+	internal class EditCustomToolsHandler : CommandHandler
+	{
+		protected override void Update (CommandInfo info)
+		{
+			info.Text = ExternalTools.ExternalToolService.Tools.Count > 0 ? GettextCatalog.GetString ("Edit Custom Tools...") : GettextCatalog.GetString ("Add Custom Tool...");
+		}
+		
+		protected override void Run ()
+		{
+			IdeApp.Workbench.ShowGlobalPreferencesDialog (IdeApp.Workbench.RootWindow, "ExternalTools");
+		}
+	}
+
 	internal class InstrumentationViewerHandler : CommandHandler
 	{
 		protected override void Run ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
index 55b2eccd15..f4a13b65ff 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
@@ -27,6 +27,7 @@
 
 
 using System;
+using System.Linq;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
@@ -66,8 +67,10 @@ namespace MonoDevelop.Ide.Commands
 	{
 		protected override void Update (CommandArrayInfo info)
 		{
-			for (int i = 0; i < IdeApp.Workbench.Pads.Count; i++) {
-				Pad pad = IdeApp.Workbench.Pads[i];
+			string group;
+			var lastListGroup = new Dictionary <CommandArrayInfo, string>();
+
+			foreach (Pad pad in IdeApp.Workbench.Pads.OrderBy (p => p.Group, StringComparer.InvariantCultureIgnoreCase)) {
 
 				CommandInfo ci = new CommandInfo(pad.Title);
 				ci.Icon = pad.Icon;
@@ -97,14 +100,25 @@ namespace MonoDevelop.Ide.Commands
 						}
 					}
 				}
+
+				int atIndex = 0;
 				for (int j = list.Count - 1; j >= 0; j--) {
-					if (!(list[j] is CommandInfoSet)) {
-						list.Insert (j + 1, ci, pad);
-						pad = null;
+					if (!(list [j] is CommandInfoSet)) {
+						atIndex = j + 1;
 						break;
 					}
 				}
-				if (pad != null) list.Insert (0, ci, pad); 
+
+				list.Insert (atIndex, ci, pad);
+				lastListGroup.TryGetValue (list, out group);
+				if (group != pad.Group) {
+					lastListGroup [list] = pad.Group;
+					if (atIndex > 0) {
+						CommandInfo sep = new CommandInfo ("-");
+						sep.IsArraySeparator = true;
+						list.Insert (atIndex, sep, null);
+					}
+				}
 			}
 		}
 
@@ -122,10 +136,24 @@ namespace MonoDevelop.Ide.Commands
 	// MonoDevelop.Ide.Commands.ViewCommands.LayoutList
 	public class LayoutListHandler : CommandHandler
 	{
+		static internal readonly Dictionary<string, string> NameMapping;
+
+		static LayoutListHandler ()
+		{
+			NameMapping = new Dictionary<string, string> ();
+			NameMapping ["Solution"] = "Code";
+			NameMapping ["Visual Design"] = "Design";
+			NameMapping ["Debug"] = "Debug";
+			NameMapping ["Unit Testing"] = "Test";
+		}
+
 		protected override void Update (CommandArrayInfo info)
 		{
+			string text;
 			foreach (var name in IdeApp.Workbench.Layouts) {
-				CommandInfo item = new CommandInfo(GettextCatalog.GetString (name));
+				if (!NameMapping.TryGetValue (name, out text))
+					text = name;
+				CommandInfo item = new CommandInfo(GettextCatalog.GetString (text));
 				item.Checked = IdeApp.Workbench.CurrentLayout == name;
 				item.Description = GettextCatalog.GetString ("Switch to layout '{0}'", name);
 				info.Add (item, name);
@@ -163,10 +191,20 @@ namespace MonoDevelop.Ide.Commands
 		protected override void Update (CommandInfo info)
 		{
 			info.Enabled = !String.Equals ("Solution", IdeApp.Workbench.CurrentLayout, StringComparison.OrdinalIgnoreCase);
+			string itemName;
+			if (!LayoutListHandler.NameMapping.TryGetValue (IdeApp.Workbench.CurrentLayout, out itemName))
+				itemName = IdeApp.Workbench.CurrentLayout;
+			if (info.Enabled)
+				info.Text = GettextCatalog.GetString ("_Delete \u201C{0}\u201D Layout", itemName);
+			else
+				info.Text = GettextCatalog.GetString ("_Delete Current Layout");
 		}
 		protected override void Run ()
 		{
-			if (MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the active layout?"), AlertButton.Delete)) {
+			string itemName;
+			if (!LayoutListHandler.NameMapping.TryGetValue (IdeApp.Workbench.CurrentLayout, out itemName))
+				itemName = IdeApp.Workbench.CurrentLayout;
+			if (MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the \u201C{0}\u201D layout?", itemName), AlertButton.Delete)) {
 				string clayout = IdeApp.Workbench.CurrentLayout;
 				IdeApp.Workbench.CurrentLayout = "Solution";
 				IdeApp.Workbench.DeleteLayout (clayout);
@@ -291,7 +329,9 @@ namespace MonoDevelop.Ide.Commands
 	{
 		protected override void Update (CommandInfo info)
 		{
-			info.Enabled = DockNotebook.ActiveNotebook != null && DockNotebook.ActiveNotebook.TabCount > 1 && DockNotebook.ActiveNotebook.Container.AllowRightInsert;
+			info.Checked = DockNotebook.ActiveNotebook?.Container?.SplitCount > 0;
+			info.Enabled = (DockNotebook.ActiveNotebook?.TabCount > 1 &&
+			                DockNotebook.ActiveNotebook?.Container?.AllowRightInsert == true) || DockNotebook.ActiveNotebook?.Container?.SplitCount > 0;
 		}
 
 		protected override void Run ()
@@ -311,7 +351,9 @@ namespace MonoDevelop.Ide.Commands
 	{
 		protected override void Update (CommandInfo info)
 		{
-			info.Enabled = DockNotebook.ActiveNotebook != null && DockNotebook.ActiveNotebook.Container.SplitCount > 0;
+			info.Checked = DockNotebook.ActiveNotebook?.Container?.SplitCount < 1;
+			info.Enabled = (DockNotebook.ActiveNotebook?.TabCount > 1 &&
+			                DockNotebook.ActiveNotebook?.Container?.AllowRightInsert == true) || DockNotebook.ActiveNotebook?.Container?.SplitCount > 0;
 		}
 
 		protected override void Run ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/WindowCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/WindowCommands.cs
index fecd08e174..9eb216750e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/WindowCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/WindowCommands.cs
@@ -134,12 +134,15 @@ namespace MonoDevelop.Ide.Commands
 	{
 		protected override void Update (CommandArrayInfo info)
 		{
+			var windows = IdeApp.CommandService.TopLevelWindowStack.ToArray (); // enumerate only once
+			if (windows.Length <= 1)
+				return;
 			int i = 0;
-			foreach (Gtk.Window window in IdeApp.CommandService.TopLevelWindowStack) {
+			foreach (Gtk.Window window in windows) {
 
 				//Create CommandInfo object
 				CommandInfo commandInfo = new CommandInfo ();
-				commandInfo.Text = window.Title.Replace ("_", "__");
+				commandInfo.Text = window.Title.Replace ("_", "__").Replace("-","\u2013").Replace(" \u2013 " + BrandingService.ApplicationName, "");
 				if (window.HasToplevelFocus)
 					commandInfo.Checked = true;
 				commandInfo.Description = GettextCatalog.GetString ("Activate window '{0}'", commandInfo.Text);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
index 6c3e766af6..5d90308e68 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
@@ -351,7 +351,8 @@ namespace MonoDevelop.Ide.Editor.Extension
 			}
 		}
 
-		[CommandHandler(TextEditorCommands.ShowCodeTemplateWindow)]
+		[CommandHandler (TextEditorCommands.ShowCodeTemplateWindow)]
+		[CommandHandler (TextEditorCommands.ShowCodeSurroundingsWindow)]
 		public virtual void RunShowCodeTemplatesWindow ()
 		{
 			ICompletionDataList completionList = null;
@@ -375,22 +376,46 @@ namespace MonoDevelop.Ide.Editor.Extension
 		[CommandUpdateHandler(TextEditorCommands.ShowCodeTemplateWindow)]
 		internal void OnUpdateShowCodeTemplatesWindow (CommandInfo info)
 		{
-			ICompletionDataList completionList = null;
-			int cpos, wlen;
-			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
-				cpos = Editor.CaretOffset;
-				wlen = 0;
+			info.Enabled = !Editor.IsSomethingSelected;
+			info.Bypass = !info.Enabled;
+			if (info.Enabled) {
+				int cpos, wlen;
+				if (!GetCompletionCommandOffset (out cpos, out wlen)) {
+					cpos = Editor.CaretOffset;
+					wlen = 0;
+				}
+				try {
+					var ctx = CompletionWidget.CreateCodeCompletionContext (cpos);
+					ctx.TriggerWordLength = wlen;
+
+					info.Bypass = ShowCodeTemplatesCommand (ctx) == null;
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while update show code templates window", e);
+					info.Bypass = true;
+				}
 			}
-			try {
-				var ctx = CompletionWidget.CreateCodeCompletionContext (cpos);
-				ctx.TriggerWordLength = wlen;
-				completionList = Editor.IsSomethingSelected ? ShowCodeSurroundingsCommand (ctx) : ShowCodeTemplatesCommand (ctx);
-
-				info.Bypass = completionList == null;
-				info.Text = Editor.IsSomethingSelected ? GettextCatalog.GetString ("_Surround With...") : GettextCatalog.GetString ("I_nsert Template...");
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while update show code templates window", e);
-				info.Bypass = true;
+		}
+
+		[CommandUpdateHandler (TextEditorCommands.ShowCodeSurroundingsWindow)]
+		internal void OnUpdateSelectionSurroundWith (CommandInfo info)
+		{
+			info.Enabled = Editor.IsSomethingSelected;
+			info.Bypass = !info.Enabled;
+			if (info.Enabled) {
+				int cpos, wlen;
+				if (!GetCompletionCommandOffset (out cpos, out wlen)) {
+					cpos = Editor.CaretOffset;
+					wlen = 0;
+				}
+				try {
+					var ctx = CompletionWidget.CreateCodeCompletionContext (cpos);
+					ctx.TriggerWordLength = wlen;
+
+					info.Bypass = ShowCodeSurroundingsCommand (ctx) == null;
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while update show code surroundings window", e);
+					info.Bypass = true;
+				}
 			}
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/DefaultCommandTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/DefaultCommandTextEditorExtension.cs
index 11f68e1c2e..d377a98b20 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/DefaultCommandTextEditorExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/DefaultCommandTextEditorExtension.cs
@@ -27,6 +27,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
 using MonoDevelop.Core.Text;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Ide.TypeSystem;
@@ -258,6 +259,9 @@ namespace MonoDevelop.Ide.Editor.Extension
 
 			var marker = (IMessageBubbleLineMarker)Editor.GetLineMarkers (line).FirstOrDefault (m => m is IMessageBubbleLineMarker);
 			info.Visible = marker != null;
+
+			if (info.Visible)
+				info.Text = marker.IsVisible ? GettextCatalog.GetString ("_Hide Current Message") : GettextCatalog.GetString ("_Show Hidden Message");
 		}
 
 		[CommandHandler (MessageBubbleCommands.Toggle)]
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/MessageBubbles/MessageBubbleCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/MessageBubbles/MessageBubbleCommands.cs
index 2e81871cff..4e49724834 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/MessageBubbles/MessageBubbleCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/MessageBubbles/MessageBubbleCommands.cs
@@ -42,7 +42,7 @@ namespace MonoDevelop.Ide.Editor
 		protected override void Update (CommandInfo info)
 		{
 			base.Update (info);
-			info.Text = IdeApp.Preferences.DefaultHideMessageBubbles ? GettextCatalog.GetString ("_Show Message Bubbles") : GettextCatalog.GetString ("_Hide Message Bubbles"); 
+			info.Checked = IdeApp.Preferences.DefaultHideMessageBubbles;
 		}
 		
 		protected override void Run (object data)
@@ -62,15 +62,17 @@ namespace MonoDevelop.Ide.Editor
 		
 		protected override void Update (CommandArrayInfo ainfo)
 		{
-			CommandInfo info = ainfo.Add (GettextCatalog.GetString ("_Errors & Warnings"), new Action (delegate {
-				MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles.Value = MonoDevelop.Ide.ShowMessageBubbles.ForErrorsAndWarnings;
+			CommandInfo info = ainfo.Add (GettextCatalog.GetString ("E_rrors"), new Action (delegate {
+				IdeApp.Preferences.ShowMessageBubbles.Value = ShowMessageBubbles.ForErrors;
+				IdeApp.Preferences.DefaultHideMessageBubbles.Value = false;
 			}));
-			info.Checked = MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles == MonoDevelop.Ide.ShowMessageBubbles.ForErrorsAndWarnings;
-			
-			info = ainfo.Add (GettextCatalog.GetString ("E_rrors only"), new Action (delegate {
-				MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles.Value = MonoDevelop.Ide.ShowMessageBubbles.ForErrors;
+			info.Checked = !IdeApp.Preferences.DefaultHideMessageBubbles && IdeApp.Preferences.ShowMessageBubbles.Value == ShowMessageBubbles.ForErrors;
+
+			info = ainfo.Add (GettextCatalog.GetString ("_Errors and Warnings"), new Action (delegate {
+				IdeApp.Preferences.ShowMessageBubbles.Value = ShowMessageBubbles.ForErrorsAndWarnings;
+				IdeApp.Preferences.DefaultHideMessageBubbles.Value = false;
 			}));
-			info.Checked = MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles.Value == MonoDevelop.Ide.ShowMessageBubbles.ForErrors;
+			info.Checked = !IdeApp.Preferences.DefaultHideMessageBubbles && IdeApp.Preferences.ShowMessageBubbles == ShowMessageBubbles.ForErrorsAndWarnings;
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs
index 938bd2991c..bfb46c7055 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs
@@ -18,8 +18,11 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 		public NewLayoutDialog ()
 		{
 			Build ();
-			
-			existingLayouts = IdeApp.Workbench.Layouts;
+
+			existingLayouts = IdeApp.Workbench.Layouts.ToList ();
+			foreach (var mapping in Commands.LayoutListHandler.NameMapping)
+				if (existingLayouts.Contains (mapping.Key))
+					existingLayouts.Add (mapping.Value);
 			
 			layoutName.Changed += OnNameChanged;
 			OnNameChanged (layoutName, EventArgs.Empty);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
index 115b78ba70..741e0a3863 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
@@ -255,8 +255,8 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 				int catCompare = cat1.CompareTo (cat2);
 				if (catCompare != 0)
 					return catCompare;
-				string t1 = c1.Text.Replace ("_", String.Empty);
-				string t2 = c2.Text.Replace ("_", String.Empty);
+				string t1 = c1.DisplayName;
+				string t2 = c2.DisplayName;
 				return t1.CompareTo (t2);
 			});
 			
@@ -268,7 +268,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 					string name = currentCat.Length == 0? translatedOther : currentCat;
 					icat = keyStore.AppendValues (null, name, String.Empty, String.Empty, (int) Pango.Weight.Bold, null, false, true);
 				}
-				string label = cmd.Text.Replace ("_", String.Empty);
+				string label = cmd.DisplayName;
 				keyStore.AppendValues (icat, cmd, label, cmd.AccelKey != null ? cmd.AccelKey : String.Empty, cmd.Description, (int) Pango.Weight.Normal, (string)cmd.Icon, true, true);
 			}
 			UpdateGlobalWarningLabel ();
@@ -449,7 +449,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 					}
 
 					foreach (Command cmd in conf.Commands) {
-						string txt = currentBindings.GetBinding (cmd) + " - " + cmd.Text;
+						string txt = currentBindings.GetBinding (cmd) + " - " + cmd.DisplayName;
 						ContextMenuItem item = new ContextMenuItem (txt);
 						Command localCmd = cmd;
 
@@ -509,7 +509,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			bindings.Remove (cmd);
 			
 			if (bindings.Count > 0) {
-				labelMessage.Markup = "<b>" + GettextCatalog.GetString ("This key combination is already bound to command '{0}'", bindings [0].Text.Replace ("_","")) + "</b>";
+				labelMessage.Markup = "<b>" + GettextCatalog.GetString ("This key combination is already bound to command '{0}'", bindings [0].DisplayName) + "</b>";
 				labelMessage.Visible = true;
 			}
 			else
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index 31746081c7..61aaf54bad 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -540,9 +540,9 @@ namespace MonoDevelop.Ide.Gui
 				post = "*";
 			}
 			if (window.ViewContent.Project != null) {
-				return window.ViewContent.Project.Name + " - " + window.ViewContent.PathRelativeToProject + post + " - " + BrandingService.ApplicationLongName;
+				return window.ViewContent.Project.Name + " – " + window.ViewContent.PathRelativeToProject + post + " – " + BrandingService.ApplicationLongName;
 			}
-			return window.ViewContent.ContentName + post + " - " + BrandingService.ApplicationLongName;
+			return window.ViewContent.ContentName + post + " – " + BrandingService.ApplicationLongName;
 		}
 		
 		void SetWorkbenchTitle ()
@@ -565,7 +565,7 @@ namespace MonoDevelop.Ide.Gui
 		static string GetDefaultTitle ()
 		{
 			if (IdeApp.ProjectOperations.CurrentSelectedProject != null)
-				return IdeApp.ProjectOperations.CurrentSelectedProject.Name + " - " + BrandingService.ApplicationLongName;
+				return IdeApp.ProjectOperations.CurrentSelectedProject.Name + " – " + BrandingService.ApplicationLongName;
 			return BrandingService.ApplicationLongName;
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
index 6580f57c50..175558522f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
@@ -96,6 +96,12 @@ namespace MonoDevelop.Ide.Gui
 				return categories;
 			}
 		}
+
+		public string Group {
+			get {
+				return content.Group;
+			}
+		}
 		
 		public void BringToFront ()
 		{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
index 51ad28502d..9daced5836 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
@@ -515,6 +515,19 @@ namespace MonoDevelop.Ide.Gui
 			}
 		}
 
+		[CommandHandler (EditCommands.EnableDisableFolding)]
+		protected void EnableDisableFolding ()
+		{
+			DefaultSourceEditorOptions.Instance.ShowFoldMargin = !DefaultSourceEditorOptions.Instance.ShowFoldMargin;
+		}
+
+		[CommandUpdateHandler (EditCommands.EnableDisableFolding)]
+		protected void UpdateEnableDisableFolding (CommandInfo info)
+		{
+			info.Text = IsFoldMarkerMarginEnabled ? GettextCatalog.GetString ("Disable _Folding") : GettextCatalog.GetString ("Enable _Folding");
+			info.Enabled = GetContent<IFoldable> () != null;
+		}
+
 		[CommandUpdateHandler (EditCommands.ToggleAllFoldings)]
 		[CommandUpdateHandler (EditCommands.FoldDefinitions)]
 		[CommandUpdateHandler (EditCommands.ToggleFolding)]
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/DocumentNavigationPoint.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/DocumentNavigationPoint.cs
index 37939b918b..7b6b440635 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/DocumentNavigationPoint.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/DocumentNavigationPoint.cs
@@ -74,7 +74,7 @@ namespace MonoDevelop.Ide.Navigation
 			}
 		}
 		
-		FilePath FileName {
+		public FilePath FileName {
 			get { return doc != null? doc.FileName : fileName; }
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/CombineOptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/CombineOptionsDialog.cs
index 3d68902157..29b89aeddd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/CombineOptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/CombineOptionsDialog.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.Ide.Projects
 	{
 		public CombineOptionsDialog (Window parentWindow, Solution solution) : base (parentWindow, solution)
 		{
-			this.Title = GettextCatalog.GetString ("Solution Options") + " - " + solution.Name;
+			this.Title = GettextCatalog.GetString ("Solution Options") + " – " + solution.Name;
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
index 4da5584e7a..44ff749e74 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
@@ -57,7 +57,7 @@ namespace MonoDevelop.Ide.Projects
 			: base (parentWindow, new PolicySet (),
 			        "/MonoDevelop/ProjectModel/Gui/DefaultPolicyPanels")
 		{
-			this.Title = GettextCatalog.GetString ("Custom Policies");
+			this.Title = GettextCatalog.GetString ("Policies");
 			editingSet = (PolicySet) DataObject;
 			
 			HBox topBar = new HBox ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectOptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectOptionsDialog.cs
index 56fb56a48a..a37757d6e8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectOptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectOptionsDialog.cs
@@ -46,7 +46,7 @@ namespace MonoDevelop.Ide.Projects
 	{
 		public ProjectOptionsDialog (Window parentWindow, SolutionItem project) : base (parentWindow, project)
 		{
-			this.Title = GettextCatalog.GetString ("Project Options") + " - " + project.Name;
+			this.Title = GettextCatalog.GetString ("Project Options") + " – " + project.Name;
 			this.DefaultWidth = 960;
 			this.DefaultHeight = 680;
 		}