diff --git a/.vscode/settings.json b/.vscode/settings.json
index 373db3f86bd..7dd2e916831 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,9 @@
// Prevents trailing spaces removal and other formatting issues which VSCode usually does.
{
"editor.insertSpaces": false,
- "files.trimTrailingWhitespace": false,
- "files.insertFinalNewline": false
+ "files.trimTrailingWhitespace": false,
+ "files.insertFinalNewline": false,
+ "editor.renderWhitespace": "all",
+ "editor.trimAutoWhitespace": false,
+ "files.trimFinalNewlines": false
}
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml
index 853028f8fb8..daed362832a 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml
@@ -111,14 +111,14 @@
-
+
-
+
-
+
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/AssemblyInfo.xft.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/AssemblyInfo.xft.xml
index 909fd3774e2..710624f8734 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/AssemblyInfo.xft.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/AssemblyInfo.xft.xml
@@ -8,7 +8,7 @@
<_Name>Assembly Information
<_Category>Misc
- md-file-source
+ md-source-file
F#
AssemblyInfo.fs
<_Description>A file defining assembly information attributes.
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpScript.xft.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpScript.xft.xml
index 430b9ab2be4..2599debb5bc 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpScript.xft.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpScript.xft.xml
@@ -2,7 +2,7 @@
<_Name>F# Script File
- md-text-file-icon
+ md-text-file
<_Description>Creates an empty F# script file.
<_Category>General
F#
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSignature.xft.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSignature.xft.xml
index 8f6627dfeb9..e819f01106a 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSignature.xft.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSignature.xft.xml
@@ -2,7 +2,7 @@
<_Name>F# Signature File
- md-text-file-icon
+ md-text-file
<_Description>Creates an empty F# signature file.
A signature file contains information about the public signatures of a set of F# program elements, such as types, namespaces, and modules.
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSource.xft.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSource.xft.xml
index f8c8804592b..20bcc80c721 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSource.xft.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/EmptyFSharpSource.xft.xml
@@ -2,7 +2,7 @@
<_Name>F# Source File
- md-text-file-icon
+ md-text-file
<_Description>Creates an empty F# source file
<_Category>General
F#
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitTestType.xft.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitTestType.xft.xml
index a165d4888d6..3a63e22a778 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitTestType.xft.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitTestType.xft.xml
@@ -3,7 +3,7 @@
<_Name>F# Test Fixture
- md-file-unit-test
+ md-unit-test-file
<_Category>NUnit
F#
<_Description>Creates a Test Fixture.
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/templates.AssemblyInfo.xft.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/templates.AssemblyInfo.xft.xml
index 012b1439d35..8ba44a094c3 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/templates.AssemblyInfo.xft.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/templates.AssemblyInfo.xft.xml
@@ -8,7 +8,7 @@
<_Name>Assembly Information
<_Category>Misc
- md-text-file-icon
+ md-text-file
F#
AssemblyInfo.fs
<_Description>A file defining assembly information attributes.
diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
index 2cc9d275894..e2fc27088f5 100644
--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
@@ -288,53 +288,53 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
diff --git a/main/src/addins/AspNet/Templates/EmptyCssFile.xft.xml b/main/src/addins/AspNet/Templates/EmptyCssFile.xft.xml
index 73d5afb0c58..0aeafc9c915 100644
--- a/main/src/addins/AspNet/Templates/EmptyCssFile.xft.xml
+++ b/main/src/addins/AspNet/Templates/EmptyCssFile.xft.xml
@@ -7,7 +7,7 @@
<_Name>Empty CSS File
- md-file-css
+ md-css-file
<_Category>Web
<_Description>Creates an empty CSS file.
EmptyCSSFile
diff --git a/main/src/addins/AspNet/Templates/EmptyJsonFile.xft.xml b/main/src/addins/AspNet/Templates/EmptyJsonFile.xft.xml
index 949cb1386c3..9c045081aaf 100644
--- a/main/src/addins/AspNet/Templates/EmptyJsonFile.xft.xml
+++ b/main/src/addins/AspNet/Templates/EmptyJsonFile.xft.xml
@@ -7,7 +7,7 @@
<_Name>Empty JSON File
- md-file-source
+ md-source-file
<_Category>Web
<_Description>Creates an empty JSON file.
EmptyJSONFile
diff --git a/main/src/addins/AspNet/Templates/EmptyLessFile.xft.xml b/main/src/addins/AspNet/Templates/EmptyLessFile.xft.xml
index 673c825e652..6ee8bf774aa 100644
--- a/main/src/addins/AspNet/Templates/EmptyLessFile.xft.xml
+++ b/main/src/addins/AspNet/Templates/EmptyLessFile.xft.xml
@@ -7,7 +7,7 @@
<_Name>LESS Style Sheet
- md-file-less
+ md-less-file
<_Category>Web
<_Description>LESS is a language that compiles into CSS.
EmptyLESSFile
diff --git a/main/src/addins/AspNet/Templates/EmptyScssFile.xft.xml b/main/src/addins/AspNet/Templates/EmptyScssFile.xft.xml
index a194039ce05..87a63bde97c 100644
--- a/main/src/addins/AspNet/Templates/EmptyScssFile.xft.xml
+++ b/main/src/addins/AspNet/Templates/EmptyScssFile.xft.xml
@@ -7,7 +7,7 @@
<_Name>SCSS Style Sheet (SASS)
- md-file-scss
+ md-scss-file
<_Category>Web
<_Description>SCSS is a language that compiles into CSS.
EmptySCSSFile
diff --git a/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml b/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml
index ba60eb2595f..65fd47390ea 100644
--- a/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml
+++ b/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml
@@ -7,7 +7,7 @@
<_Name>TypeScript file
- md-file-ts
+ md-ts-file
<_Category>Web
<_Description>A blank TypeScript source file.
EmptyTSFile
diff --git a/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml b/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml
index 3015f99067a..5b4859f335d 100644
--- a/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml
+++ b/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml
@@ -7,7 +7,7 @@
<_Name>ASP.NET Global.asax
<_Category>ASP.NET
- md-html-file-icon
+ md-html-file
C#
AspNetApp
Global.asax
diff --git a/main/src/addins/AspNet/Templates/Mvc/Controller.xft.xml b/main/src/addins/AspNet/Templates/Mvc/Controller.xft.xml
index 8ffa9a96d82..2969436299c 100644
--- a/main/src/addins/AspNet/Templates/Mvc/Controller.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/Controller.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC Controller
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/LayoutPage.xft.xml b/main/src/addins/AspNet/Templates/Mvc/LayoutPage.xft.xml
index e1f9de44479..a365701a655 100644
--- a/main/src/addins/AspNet/Templates/Mvc/LayoutPage.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/LayoutPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC Layout Page (Razor)
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/PartialViewPageRazor.xft.xml b/main/src/addins/AspNet/Templates/Mvc/PartialViewPageRazor.xft.xml
index 53a45900c66..0f80517fbaf 100644
--- a/main/src/addins/AspNet/Templates/Mvc/PartialViewPageRazor.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/PartialViewPageRazor.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC Partial View Page (Razor)
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/UserControl.xft.xml b/main/src/addins/AspNet/Templates/Mvc/UserControl.xft.xml
index aa83a81f14d..c92ee7fa74a 100644
--- a/main/src/addins/AspNet/Templates/Mvc/UserControl.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/UserControl.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC View User Control
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/ViewContentPage.xft.xml b/main/src/addins/AspNet/Templates/Mvc/ViewContentPage.xft.xml
index 4240c01a8ca..f169fe130f4 100644
--- a/main/src/addins/AspNet/Templates/Mvc/ViewContentPage.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/ViewContentPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC View Content
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/ViewMasterPage.xft.xml b/main/src/addins/AspNet/Templates/Mvc/ViewMasterPage.xft.xml
index 6b37db3e463..86bd0a4c2ef 100644
--- a/main/src/addins/AspNet/Templates/Mvc/ViewMasterPage.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/ViewMasterPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC Master Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/ViewPage.xft.xml b/main/src/addins/AspNet/Templates/Mvc/ViewPage.xft.xml
index 2426bc8b4ca..aa60320c61f 100644
--- a/main/src/addins/AspNet/Templates/Mvc/ViewPage.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/ViewPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC View Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/ViewPageRazor.xft.xml b/main/src/addins/AspNet/Templates/Mvc/ViewPageRazor.xft.xml
index 7d347c26b10..640ef601eff 100644
--- a/main/src/addins/AspNet/Templates/Mvc/ViewPageRazor.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/ViewPageRazor.xft.xml
@@ -6,7 +6,7 @@
<_Name>ASP.NET MVC View Page (Razor)
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET MVC
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml b/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml
index c183219ddb3..5968023ff58 100644
--- a/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml
@@ -4,7 +4,7 @@
<_Name>ASP.NET MVC Views Configuration
<_Category>ASP.NET MVC
- md-html-file-icon
+ md-html-file
C#
AspNetApp
Web.config
diff --git a/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml b/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml
index 41e786594e2..471843a2dce 100644
--- a/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml
@@ -8,7 +8,7 @@
<_Name>Web Application Configuration
<_Category>ASP.NET
- md-html-file-icon
+ md-html-file
C#
AspNetApp
Web.config
diff --git a/main/src/addins/AspNet/Templates/WebConfig-SubDir.xft.xml b/main/src/addins/AspNet/Templates/WebConfig-SubDir.xft.xml
index f4a0add3130..26ad1f47ca8 100644
--- a/main/src/addins/AspNet/Templates/WebConfig-SubDir.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebConfig-SubDir.xft.xml
@@ -8,7 +8,7 @@
<_Name>Subdirectory Web Configuration
<_Category>ASP.NET
- md-html-file-icon
+ md-html-file
C#
AspNetApp
web.config
diff --git a/main/src/addins/AspNet/Templates/WebForms/MasterPage-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/MasterPage-CodeBehind.xft.xml
index 8163d9d9395..73a17115bda 100644
--- a/main/src/addins/AspNet/Templates/WebForms/MasterPage-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/MasterPage-CodeBehind.xft.xml
@@ -6,7 +6,7 @@
<_Name>Master Page with CodeBehind
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
<_Description>Creates an ASP.NET Master Page with a CodeBehind class.
diff --git a/main/src/addins/AspNet/Templates/WebForms/MasterPage-Empty.xft.xml b/main/src/addins/AspNet/Templates/WebForms/MasterPage-Empty.xft.xml
index bf173a65480..ea08566963d 100644
--- a/main/src/addins/AspNet/Templates/WebForms/MasterPage-Empty.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/MasterPage-Empty.xft.xml
@@ -6,7 +6,7 @@
<_Name>Master Page without CodeBehind
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml
index 1a7476f11d2..88365eb6e21 100644
--- a/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml
@@ -6,7 +6,7 @@
<_Name>Nested Master Page with CodeBehind
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
<_Description>Creates an ASP.NET Nested Master Page with a CodeBehind class.
diff --git a/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage.xft.xml b/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage.xft.xml
index 47338eaea79..856a1bca0de 100644
--- a/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/NestedMasterPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>Nested Master Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
<_Description>Creates an ASP.NET Nested Master Page.
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebContentForm-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebContentForm-CodeBehind.xft.xml
index 88d5a3c23d1..a44b055f27d 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebContentForm-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebContentForm-CodeBehind.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web Content Form with CodeBehind
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebContentForm.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebContentForm.xft.xml
index 8ecab6b0abd..932965867ac 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebContentForm.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebContentForm.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web Content Form
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebControl-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebControl-CodeBehind.xft.xml
index d05c3ee8e24..066561f6cc4 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebControl-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebControl-CodeBehind.xft.xml
@@ -7,7 +7,7 @@
<_Name>User Control with CodeBehind
<_Category>ASP.NET Web Forms
- md-html-file-icon
+ md-html-file
C#
AspNetApp
<_Description>Creates an ASP.NET user control with a CodeBehind class.
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebControl-Empty.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebControl-Empty.xft.xml
index 70f6733a7a1..5535a226e69 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebControl-Empty.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebControl-Empty.xft.xml
@@ -7,7 +7,7 @@
<_Name>User Control
<_Category>ASP.NET Web Forms
- md-html-file-icon
+ md-html-file
C#
AspNetApp
<_Description>Creates an empty ASP.NET user control.
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebForm-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebForm-CodeBehind.xft.xml
index 32d0625e56d..533d567932b 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebForm-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebForm-CodeBehind.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web Form with CodeBehind
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebForm-Empty.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebForm-Empty.xft.xml
index 25f85c13af0..e7ce2317d74 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebForm-Empty.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebForm-Empty.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web Form
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebHandler-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebHandler-CodeBehind.xft.xml
index 90ad0504597..3d4aa64e174 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebHandler-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebHandler-CodeBehind.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web Handler with CodeBehind
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebHandler-Empty.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebHandler-Empty.xft.xml
index c72cd119aea..ef06a0ade3d 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebHandler-Empty.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebHandler-Empty.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web Handler
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Web Forms
C#
AspNetApp
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebService-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebService-CodeBehind.xft.xml
index b4138b21751..36e6de200d5 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebService-CodeBehind.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebService-CodeBehind.xft.xml
@@ -7,7 +7,7 @@
<_Name>Web Service with CodeBehind
<_Category>ASP.NET Web Forms
- md-html-file-icon
+ md-html-file
C#
AspNetApp
<_Description>Creates an ASP.NET web service with a CodeBehind class.
diff --git a/main/src/addins/AspNet/Templates/WebForms/WebService-Empty.xft.xml b/main/src/addins/AspNet/Templates/WebForms/WebService-Empty.xft.xml
index 15ef51f31a8..f1dca611803 100644
--- a/main/src/addins/AspNet/Templates/WebForms/WebService-Empty.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebForms/WebService-Empty.xft.xml
@@ -7,7 +7,7 @@
<_Name>Web Service
<_Category>ASP.NET Web Forms
- md-html-file-icon
+ md-html-file
C#
AspNetApp
<_Description>Creates an ASP.NET web service.
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
index b3044ad8b1a..0910b046fb5 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
+++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
@@ -176,7 +176,7 @@
-
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
index 6bc80d063c1..05e953c2629 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
@@ -740,7 +740,7 @@ static void RenderIcon (TreeViewColumn col, CellRenderer cell, TreeModel model,
{
var pixbufCellRenderer = (CellRendererImage)cell;
if (model.IterHasChild (iter)) {
- pixbufCellRenderer.Image = ImageService.GetIcon (((TreeView)col.TreeView).GetRowExpanded (model.GetPath (iter)) ? MonoDevelop.Ide.Gui.Stock.OpenFolder : MonoDevelop.Ide.Gui.Stock.ClosedFolder, IconSize.Menu);
+ pixbufCellRenderer.Image = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, IconSize.Menu);
} else {
pixbufCellRenderer.Image = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Property, IconSize.Menu);
}
diff --git a/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml b/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml
index 3afcbeed266..dbd376f2875 100644
--- a/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml
+++ b/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml
@@ -8,7 +8,7 @@
<_Name>Assembly Information
<_Category>Misc
- md-file-information
+ md-information-file
C#
AssemblyInfo.cs
<_Description>A file defining assembly information attributes.
diff --git a/main/src/addins/CSharpBinding/templates/EmptyCSharpFile.xft.xml b/main/src/addins/CSharpBinding/templates/EmptyCSharpFile.xft.xml
index a845de4b18f..301950af49f 100644
--- a/main/src/addins/CSharpBinding/templates/EmptyCSharpFile.xft.xml
+++ b/main/src/addins/CSharpBinding/templates/EmptyCSharpFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Empty File
- md-text-file-icon
+ md-text-file
<_Category>General
C#
<_Description>Creates an empty C# file.
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs
index 662d2da34f9..e1452c99b7f 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs
@@ -79,7 +79,7 @@ void AddEntry (TreeIter iter, SolutionFolderItem entry)
if (entry.ParentFolder == null)
icon = MonoDevelop.Ide.Gui.Stock.Solution;
else if (entry is SolutionFolder)
- icon = MonoDevelop.Ide.Gui.Stock.SolutionFolderClosed;
+ icon = MonoDevelop.Ide.Gui.Stock.SolutionFolder;
else if (entry is Project)
icon = ((Project)entry).StockIcon;
else
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewImportsPage.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewImportsPage.xft.xml
index 128725a3950..e755621f359 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewImportsPage.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewImportsPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>MVC View Imports Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
_ViewImports
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewLayoutPage.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewLayoutPage.xft.xml
index c606c68a6b7..35dc8d6b0b2 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewLayoutPage.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewLayoutPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>MVC View Layout Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
_Layout
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewPage.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewPage.xft.xml
index f44af3c2a53..8c10fa395e8 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewPage.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>MVC View Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
Index
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewStartPage.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewStartPage.xft.xml
index c6ecc02bb53..9b8edddb9a4 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewStartPage.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/MVCViewStartPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>MVC View Start Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
_ViewStart
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/MiddlewareClass.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/MiddlewareClass.xft.xml
index 115c0d36faf..2dc6c79e540 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/MiddlewareClass.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/MiddlewareClass.xft.xml
@@ -6,7 +6,7 @@
<_Name>Middleware Class
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
Middleware
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/MvcController.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/MvcController.xft.xml
index 80890c85aaa..c72b0990f34 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/MvcController.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/MvcController.xft.xml
@@ -6,7 +6,7 @@
<_Name>MVC Controller Class
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
HomeController
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPage.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPage.xft.xml
index 97a548948fb..8297d0ed5fe 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPage.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPage.xft.xml
@@ -6,7 +6,7 @@
<_Name>Razor Page
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
Index
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPageWithPageModel.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPageWithPageModel.xft.xml
index 23d071690c1..8e602d55a0e 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPageWithPageModel.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorPageWithPageModel.xft.xml
@@ -6,7 +6,7 @@
<_Name>Razor Page (with page model)
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
Index
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorTagHelper.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorTagHelper.xft.xml
index 637686310e4..5645601e734 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorTagHelper.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/RazorTagHelper.xft.xml
@@ -6,7 +6,7 @@
<_Name>Razor Tag Helper
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
RazorTagHelper
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/StartupClass.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/StartupClass.xft.xml
index 95b5ed7acc6..01d9c21868f 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/StartupClass.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/StartupClass.xft.xml
@@ -6,7 +6,7 @@
<_Name>Startup Class
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
Startup
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Templates/WebApiController.xft.xml b/main/src/addins/MonoDevelop.AspNetCore/Templates/WebApiController.xft.xml
index 3594251b338..41a5f00efe3 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Templates/WebApiController.xft.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Templates/WebApiController.xft.xml
@@ -6,7 +6,7 @@
<_Name>Web API Controller Class
- md-html-file-icon
+ md-html-file
<_Category>ASP.NET Core
C#
ValuesController
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs
index 988df2ea2e5..e90a5a135af 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs
@@ -51,8 +51,7 @@ public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
{
nodeInfo.Label = MonoDevelop.Core.GettextCatalog.GetString ("References");
- nodeInfo.Icon = Context.GetIcon (Stock.OpenReferenceFolder);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedReferenceFolder);
+ nodeInfo.Icon = Context.GetIcon (Stock.ReferenceFolder);
}
public override void BuildChildNodes (ITreeBuilder ctx, object dataObject)
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs
index adaa35fea0e..752b88ef842 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs
@@ -47,8 +47,7 @@ public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
{
nodeInfo.Label = MonoDevelop.Core.GettextCatalog.GetString ("Resources");
- nodeInfo.Icon = Context.GetIcon (Stock.OpenResourceFolder);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedResourceFolder);
+ nodeInfo.Icon = Context.GetIcon (Stock.ResourceFolder);
}
public override void BuildChildNodes (ITreeBuilder ctx, object dataObject)
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs
index 6327acd79cc..9403546d077 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs
@@ -93,8 +93,7 @@ public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
{
nodeInfo.Label = MonoDevelop.Core.GettextCatalog.GetString ("Base Types");
- nodeInfo.Icon = Context.GetIcon (Stock.OpenFolder);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedFolder);
+ nodeInfo.Icon = Context.GetIcon (Stock.Folder);
}
public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs
index a9b6fae962c..6639778d896 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs
@@ -50,7 +50,7 @@ public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, Nod
{
Mono.Cecil.Resource resource = (Mono.Cecil.Resource)dataObject;
nodeInfo.Label = Ide.TypeSystem.Ambience.EscapeText (resource.Name);
- nodeInfo.Icon = Context.GetIcon (Stock.ResourceFileIcon);
+ nodeInfo.Icon = Context.GetIcon (Stock.ResourceFile);
}
public override void BuildChildNodes (ITreeBuilder ctx, object dataObject)
diff --git a/main/src/addins/MonoDevelop.ConnectedServices/ConnectedServiceDependency.cs b/main/src/addins/MonoDevelop.ConnectedServices/ConnectedServiceDependency.cs
index ff068fb54be..a2bfed9d40f 100644
--- a/main/src/addins/MonoDevelop.ConnectedServices/ConnectedServiceDependency.cs
+++ b/main/src/addins/MonoDevelop.ConnectedServices/ConnectedServiceDependency.cs
@@ -4,6 +4,7 @@
using System.Threading.Tasks;
using MonoDevelop.Core;
using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui;
using Xwt.Drawing;
namespace MonoDevelop.ConnectedServices
@@ -22,13 +23,13 @@ public abstract class ConnectedServiceDependency : IConnectedServiceDependency
/// The category string for packages, this will be localised to the user
///
public readonly static ConnectedServiceDependencyCategory PackageDependencyCategory =
- new ConnectedServiceDependencyCategory (GettextCatalog.GetString ("Packages"), "md-folder-services");
+ new ConnectedServiceDependencyCategory (GettextCatalog.GetString ("Packages"), Stock.ServicesFolder);
///
/// The category string for code, this will be localised to the user
///
public readonly static ConnectedServiceDependencyCategory CodeDependencyCategory =
- new ConnectedServiceDependencyCategory (GettextCatalog.GetString ("Code"), "md-folder-code");
+ new ConnectedServiceDependencyCategory (GettextCatalog.GetString ("Code"), Stock.CodeFolder);
Status status = (Status)(-1);
diff --git a/main/src/addins/MonoDevelop.ConnectedServices/Gui.SolutionPad/ConnectedServicesFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.ConnectedServices/Gui.SolutionPad/ConnectedServicesFolderNodeBuilder.cs
index c88664b7d2f..271d291e574 100644
--- a/main/src/addins/MonoDevelop.ConnectedServices/Gui.SolutionPad/ConnectedServicesFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.ConnectedServices/Gui.SolutionPad/ConnectedServicesFolderNodeBuilder.cs
@@ -40,8 +40,7 @@ public override Type CommandHandlerType {
public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
{
nodeInfo.Label = ConnectedServices.SolutionTreeNodeName;
- nodeInfo.Icon = Context.GetIcon ("md-folder-services");
- nodeInfo.ClosedIcon = Context.GetIcon ("md-folder-services");
+ nodeInfo.Icon = Context.GetIcon (Stock.ServicesFolder);
}
public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index 3d28974ddd8..a2c16008df0 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -1271,7 +1271,7 @@ public static string GetIcon (ObjectValueFlags flags)
case ObjectValueFlags.Method: source = "method"; break;
case ObjectValueFlags.Literal: return "md-literal";
case ObjectValueFlags.Namespace: return "md-name-space";
- case ObjectValueFlags.Group: return "md-open-resource-folder";
+ case ObjectValueFlags.Group: return Ide.Gui.Stock.ResourceFolder;
case ObjectValueFlags.Field: source = "field"; break;
case ObjectValueFlags.Variable: return "md-variable";
default: return "md-empty";
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/AssemblyDependenciesNode.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/AssemblyDependenciesNode.cs
index 8673e3ca0ec..1daa4dea6f5 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/AssemblyDependenciesNode.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/AssemblyDependenciesNode.cs
@@ -59,11 +59,11 @@ public string GetSecondaryLabel ()
}
public IconId Icon {
- get { return Stock.OpenReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IconId ClosedIcon {
- get { return Stock.ClosedReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IEnumerable GetChildNodes ()
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/DependenciesNode.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/DependenciesNode.cs
index 6b5e75d3247..fab4efacbbf 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/DependenciesNode.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/DependenciesNode.cs
@@ -55,11 +55,11 @@ public string GetSecondaryLabel ()
}
public IconId Icon {
- get { return Stock.OpenReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IconId ClosedIcon {
- get { return Stock.ClosedReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IEnumerable GetTargetFrameworkNodes (bool sdkDependencies)
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependenciesNode.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependenciesNode.cs
index e22d152dca5..0c6dc13bb13 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependenciesNode.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependenciesNode.cs
@@ -60,11 +60,11 @@ public string GetSecondaryLabel ()
}
public IconId Icon {
- get { return Stock.OpenReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IconId ClosedIcon {
- get { return Stock.ClosedReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public bool LoadedDependencies {
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/ProjectDependenciesNode.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/ProjectDependenciesNode.cs
index 2a8f52ea070..99c0430049d 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/ProjectDependenciesNode.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/ProjectDependenciesNode.cs
@@ -59,11 +59,11 @@ public string GetSecondaryLabel ()
}
public IconId Icon {
- get { return Stock.OpenReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IconId ClosedIcon {
- get { return Stock.ClosedReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IEnumerable GetChildNodes ()
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/SdkDependenciesNode.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/SdkDependenciesNode.cs
index 137084bee9b..3fc662e57fc 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/SdkDependenciesNode.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/SdkDependenciesNode.cs
@@ -58,11 +58,11 @@ public string GetSecondaryLabel ()
}
public IconId Icon {
- get { return Stock.OpenReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IconId ClosedIcon {
- get { return Stock.ClosedReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public bool LoadedDependencies {
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
index 2e1b0f44ea8..fe9747ff9bd 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
@@ -65,8 +65,7 @@ public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, Nod
} else {
nodeInfo.Label = GettextCatalog.GetString ("User Interface");
}
- nodeInfo.Icon = Context.GetIcon (Stock.OpenResourceFolder);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedResourceFolder);
+ nodeInfo.Icon = Context.GetIcon (Stock.ResourceFolder);
}
public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs
index f9ef7ca3801..6b1028315ae 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs
@@ -105,11 +105,11 @@ internal IDotNetProject Project {
}
public IconId Icon {
- get { return Stock.OpenReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public IconId ClosedIcon {
- get { return Stock.ClosedReferenceFolder; }
+ get { return Stock.ReferenceFolder; }
}
public string GetLabel ()
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectPackagesFolderNodeTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectPackagesFolderNodeTests.cs
index 4bb871cb7a5..e0e4229f9e7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectPackagesFolderNodeTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectPackagesFolderNodeTests.cs
@@ -127,7 +127,7 @@ public void Icon_GetIconForDisplay_ReturnsOpenReferenceFolderIcon ()
IconId icon = packagesFolderNode.Icon;
- Assert.AreEqual (Stock.OpenReferenceFolder, icon);
+ Assert.AreEqual (Stock.ReferenceFolder, icon);
}
[Test]
@@ -138,7 +138,7 @@ public void ClosedIcon_GetIconForDisplay_ReturnsClosedReferenceFolderIcon ()
IconId icon = packagesFolderNode.ClosedIcon;
- Assert.AreEqual (Stock.ClosedReferenceFolder, icon);
+ Assert.AreEqual (Stock.ReferenceFolder, icon);
}
[Test]
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml
index aaebb07b4ea..7ed39a08896 100644
--- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml
@@ -3,7 +3,7 @@
<_Name>Test Fixture
- md-file-unit-test
+ md-unit-test-file
<_Category>NUnit
C#,VBNet
<_Description>Creates a Test Fixture.
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
index 2a2575bcf50..c519f0874e6 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
+++ b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
@@ -47,7 +47,7 @@
-
+
diff --git a/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml b/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml
index b9627d89fb2..d93e78f1e5b 100644
--- a/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml
+++ b/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml
@@ -8,7 +8,7 @@
<_Name>Assembly Information
<_Category>Misc
- md-file-information
+ md-information-file
VBNet
AssemblyInfo.vb
<_Description>A file defining assembly information attributes.
diff --git a/main/src/addins/VBNetBinding/templates/EmptyVBFile.xft.xml b/main/src/addins/VBNetBinding/templates/EmptyVBFile.xft.xml
index 7a0246dd29c..6f2c055a810 100644
--- a/main/src/addins/VBNetBinding/templates/EmptyVBFile.xft.xml
+++ b/main/src/addins/VBNetBinding/templates/EmptyVBFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Empty File
- md-file-source
+ md-source-file
<_Category>General
VBNet
<_Description>Creates an empty VB.Net file.
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
index 0df03a9b53b..1a609d6fbf5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
@@ -232,7 +232,7 @@ TreeIter AppendFileInfo (ChangeSetItem n)
Xwt.Drawing.Image fileIcon;
if (n.IsDirectory)
- fileIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.ClosedFolder, Gtk.IconSize.Menu);
+ fileIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, Gtk.IconSize.Menu);
else
fileIcon = DesktopService.GetIconForFile (n.LocalPath, Gtk.IconSize.Menu);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
index cf634cff826..bd4ccbf8c7b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
@@ -589,7 +589,7 @@ TreeIter AppendFileInfo (VersionInfo n, bool expanded)
Xwt.Drawing.Image fileIcon;
if (n.IsDirectory)
- fileIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.ClosedFolder, Gtk.IconSize.Menu);
+ fileIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, Gtk.IconSize.Menu);
else
fileIcon = DesktopService.GetIconForFile (n.LocalPath, Gtk.IconSize.Menu);
diff --git a/main/src/addins/Xml/Editor/XmlEditorService.cs b/main/src/addins/Xml/Editor/XmlEditorService.cs
index b5fb77e7a59..f1a69a3061e 100644
--- a/main/src/addins/Xml/Editor/XmlEditorService.cs
+++ b/main/src/addins/Xml/Editor/XmlEditorService.cs
@@ -106,7 +106,7 @@ public static bool IsXslOutputViewContentActive {
public static ProgressMonitor GetMonitor ()
{
- return IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("XML", "md-xml-file-icon", true, true);
+ return IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("XML", "md-xml-file", true, true);
}
#region Formatting utilities
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
index 4ce50d7fadf..c9fb54f5533 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
@@ -388,7 +388,7 @@
shortcut = "Control|N"
macShortcut = "Meta|N"
_description = "Create a new file"
- icon = "md-regular-file" />
+ icon = "md-generic-file" />
-
+
-
+
-
+
-
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
index 69b96597333..94e4a0d759c 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
@@ -88,8 +88,6 @@
-
-
@@ -105,10 +103,7 @@
-
-
-
@@ -118,29 +113,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -148,15 +122,9 @@
-
-
-
-
-
-
@@ -164,7 +132,6 @@
-
@@ -237,42 +204,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -286,8 +232,6 @@
-
-
@@ -296,6 +240,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index 191409be2b4..3d276ca9661 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -156,7 +156,7 @@ static void RenderIcon (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.Tr
var cri = (CellRendererImage)cell;
if (template == null) {
- cri.Image = ImageService.GetIcon (((TreeView)column.TreeView).GetRowExpanded (model.GetPath (iter)) ? MonoDevelop.Ide.Gui.Stock.OpenFolder : MonoDevelop.Ide.Gui.Stock.ClosedFolder, IconSize.Menu);
+ cri.Image = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, IconSize.Menu);
} else {
cri.Image = ImageService.GetIcon (template.Icon, IconSize.Menu);
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs
index 486c780048b..a4b10c35343 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs
@@ -245,7 +245,7 @@ Xwt.Drawing.Image GetDefaultIcon ()
if (bf == null)
bf = DefaultFileIcon;
if (bf == null)
- bf = ImageService.GetIcon ("md-regular-file", true);
+ bf = ImageService.GetIcon ("md-generic-file", true);
iconHash [id] = bf;
return bf;
}
@@ -262,7 +262,7 @@ string GetIconIdForFile (string fileName)
string GetIconIdForType (string type)
{
if (type == "text/plain")
- return "md-text-file-icon";
+ return "md-text-file";
MimeTypeNode mt = FindMimeType (type);
if (mt != null)
return mt.Icon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectSelectorWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectSelectorWidget.cs
index f6ed451e5d9..1959f29e5dd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectSelectorWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectSelectorWidget.cs
@@ -170,7 +170,7 @@ void AddEntry (TreeIter iter, WorkspaceObject item)
if (item is Solution)
icon = MonoDevelop.Ide.Gui.Stock.Solution;
else if (item is SolutionFolder)
- icon = MonoDevelop.Ide.Gui.Stock.SolutionFolderClosed;
+ icon = MonoDevelop.Ide.Gui.Stock.SolutionFolder;
else if (item is WorkspaceItem)
icon = MonoDevelop.Ide.Gui.Stock.Workspace;
else if (item is Project)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
index a53acf34d43..a08c2b61dbb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
@@ -54,8 +54,7 @@ public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, Nod
{
SolutionFolder folder = dataObject as SolutionFolder;
nodeInfo.Label = folder.Name;
- nodeInfo.Icon = Context.GetIcon (Stock.SolutionFolderOpen);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.SolutionFolderClosed);
+ nodeInfo.Icon = Context.GetIcon (Stock.SolutionFolder);
}
public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
index aff577c7732..39a8209df0d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
@@ -44,9 +44,8 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
{
class ProjectFolderNodeBuilder: FolderNodeBuilder
{
- Xwt.Drawing.Image folderOpenIcon;
- Xwt.Drawing.Image folderClosedIcon;
-
+ Xwt.Drawing.Image folderIcon;
+
public override Type NodeDataType {
get { return typeof(ProjectFolder); }
}
@@ -69,8 +68,7 @@ protected override void Initialize ()
{
base.Initialize ();
- folderOpenIcon = Context.GetIcon (Stock.OpenFolder);
- folderClosedIcon = Context.GetIcon (Stock.ClosedFolder);
+ folderIcon = Context.GetIcon (Stock.Folder);
}
public override void OnNodeAdded (object dataObject)
@@ -126,8 +124,7 @@ public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, Nod
ProjectFolder folder = (ProjectFolder) dataObject;
nodeInfo.Label = GLib.Markup.EscapeText (folder.Name);
- nodeInfo.Icon = folderOpenIcon;
- nodeInfo.ClosedIcon = folderClosedIcon;
+ nodeInfo.Icon = folderIcon;
}
public override object GetParentObject (object dataObject)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
index e1f87cfd472..3f120932230 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
@@ -72,8 +72,7 @@ public override void Dispose ()
public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
{
nodeInfo.Label = GLib.Markup.EscapeText (GettextCatalog.GetString ("References"));
- nodeInfo.Icon = Context.GetIcon (Stock.OpenReferenceFolder);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedReferenceFolder);
+ nodeInfo.Icon = Context.GetIcon (Stock.ReferenceFolder);
}
public override void BuildChildNodes (ITreeBuilder ctx, object dataObject)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderNodeBuilder.cs
index 8daa364fc92..47ce8f0102f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderNodeBuilder.cs
@@ -62,8 +62,7 @@ public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, Nod
{
SolutionFolder folder = dataObject as SolutionFolder;
nodeInfo.Label = GLib.Markup.EscapeText (folder.Name);
- nodeInfo.Icon = Context.GetIcon (Stock.SolutionFolderOpen);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.SolutionFolderClosed);
+ nodeInfo.Icon = Context.GetIcon (Stock.SolutionFolder);
}
public override void BuildChildNodes (ITreeBuilder ctx, object dataObject)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs
index 0bb1e80b4eb..04b6c7899cb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs
@@ -33,7 +33,6 @@ namespace MonoDevelop.Ide.Gui
{
public class Stock
{
- public static readonly IconId AssetsFolder = "md-folder-assets";
public static readonly IconId AddNamespace = "md-add-namespace";
public static readonly IconId BreakPoint = "md-break-point";
public static readonly IconId BuildCombine = "md-build-combine";
@@ -42,9 +41,6 @@ public class Stock
public static readonly IconId CloseAllDocuments = "md-close-all-documents";
public static readonly IconId CloseCombine = "md-close-combine-icon";
public static readonly IconId CloseIcon = Gtk.Stock.Close;
- public static readonly IconId ClosedFolder = "md-closed-folder";
- public static readonly IconId ClosedReferenceFolder = "md-closed-reference-folder";
- public static readonly IconId ClosedResourceFolder = "md-closed-resource-folder";
public static readonly IconId Solution = "md-solution";
public static readonly IconId Workspace = "md-workspace";
public static readonly IconId CopyIcon = Gtk.Stock.Copy;
@@ -52,12 +48,10 @@ public class Stock
public static readonly IconId Delegate = "md-delegate";
public static readonly IconId DeleteIcon = Gtk.Stock.Delete;
public static readonly IconId Empty = "md-empty";
- public static readonly IconId EmptyFileIcon = "md-empty-file-icon";
public static readonly IconId Enum = "md-enum";
public static readonly IconId Error = "md-error";
public static readonly IconId Event = "md-event";
public static readonly IconId Field = "md-field";
- public static readonly IconId FileXmlIcon = "md-file-xml-icon";
public static readonly IconId FindIcon = "md-magnify";
public static readonly IconId FindNextIcon = "md-find-next";
public static readonly IconId FindPrevIcon = "md-find-prev";
@@ -77,14 +71,10 @@ public class Stock
public static readonly IconId InternalStruct = "md-internal-struct";
public static readonly IconId Literal = "md-literal";
public static readonly IconId Method = "md-method";
- public static readonly IconId GenericFile = "md-regular-file";
public static readonly IconId NameSpace = "md-name-space";
public static readonly IconId NewDocumentIcon = Gtk.Stock.New;
public static readonly IconId NextWindowIcon = Gtk.Stock.GoForward;
public static readonly IconId OpenFileIcon = Gtk.Stock.Open;
- public static readonly IconId OpenFolder = "md-open-folder";
- public static readonly IconId OpenReferenceFolder = "md-open-reference-folder";
- public static readonly IconId OpenResourceFolder = "md-open-resource-folder";
public static readonly IconId Options = "md-preferences";
public static readonly IconId OutputIcon = "md-output-icon";
public static readonly IconId PasteIcon = Gtk.Stock.Paste;
@@ -120,7 +110,6 @@ public class Stock
public static readonly IconId ReferenceWarning = "md-reference-warning";
public static readonly IconId Region = "md-region";
public static readonly IconId ReplaceIcon = Gtk.Stock.FindAndReplace;
- public static readonly IconId ResourceFileIcon = "md-resource-file-icon";
public static readonly IconId Console = "md-console";
public static readonly IconId RunProgramIcon = Gtk.Stock.Execute;
public static readonly IconId SaveAllIcon = "md-save-all";
@@ -130,13 +119,9 @@ public class Stock
public static readonly IconId Project = "md-project";
public static readonly IconId Struct = "md-struct";
public static readonly IconId TaskListIcon = "md-task-list";
- public static readonly IconId TextFileIcon = "md-text-file-icon";
public static readonly IconId ToggleBookmark = "md-bookmark-toggle";
public static readonly IconId UndoIcon = Gtk.Stock.Undo;
public static readonly IconId Warning = "md-warning";
- public static readonly IconId XmlFileIcon = "md-xml-file-icon";
- public static readonly IconId SolutionFolderOpen = "md-solution-folder-open";
- public static readonly IconId SolutionFolderClosed = "md-solution-folder-closed";
public static readonly IconId Package = "md-package";
public static readonly IconId StatusSolutionOperation = "md-status-waiting";
public static readonly IconId StatusDownload = "md-status-download";
@@ -169,5 +154,35 @@ public class Stock
public static readonly IconId PadUpload = "md-pad-upload";
public static readonly IconId PadDeviceDeployment = "md-pad-device-deployment";
public static readonly IconId PadExecute = "md-pad-execute";
+
+ // Folder icons
+ public static readonly IconId Folder = "md-folder";
+ public static readonly IconId ReferenceFolder = "md-reference-folder";
+ public static readonly IconId ResourceFolder = "md-resource-folder";
+ public static readonly IconId SolutionFolder = "md-solution-folder";
+ public static readonly IconId ComponentFolder = "md-component-folder"; // Unused in monodevelop
+ public static readonly IconId AssetsFolder = "md-assets-folder"; // Unused in monodevelop
+ public static readonly IconId CodeFolder = "md-code-folder";
+ public static readonly IconId ServicesFolder = "md-services-folder";
+
+ // Deprecated folder icons
+ public static readonly IconId ClosedFolder = "md-folder";
+ public static readonly IconId OpenFolder = "md-folder";
+ public static readonly IconId ClosedReferenceFolder = "md-reference-folder";
+ public static readonly IconId OpenReferenceFolder = "md-reference-folder";
+ public static readonly IconId ClosedResourceFolder = "md-resource-folder";
+ public static readonly IconId OpenResourceFolder = "md-resource-folder";
+ public static readonly IconId SolutionFolderClosed = "md-solution-folder";
+ public static readonly IconId SolutionFolderOpen = "md-solution-folder";
+
+ // File icons
+ public static readonly IconId GenericFile = "md-generic-file";
+ public static readonly IconId EmptyFile = "md-empty-file";
+ public static readonly IconId ResourceFile = "md-resource-file";
+
+ // Deprecated file icons
+ public static readonly IconId FileXmlIcon = "md-xml-file"; // Unused in monodevelop
+ public static readonly IconId TextFileIcon = "md-text-file"; // Unused in monodevelop
+ public static readonly IconId XmlFileIcon = "md-xml-file"; // Unused in monodevelop
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs
index 0155de9d92e..4bfebc9431e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/NamespaceSynchronisationPanel.cs
@@ -263,7 +263,7 @@ void UpdatePreview (object sender, EventArgs args)
string rootNamespace = checkDefaultAsRoot.Active? GettextCatalog.GetString ("Default.Namespace") : "";
- string folderIcon = MonoDevelop.Ide.Gui.Stock.OpenFolder;
+ string folderIcon = MonoDevelop.Ide.Gui.Stock.Folder;
string projectIcon = MonoDevelop.Ide.Gui.Stock.Project;
iter = previewStore.AppendValues (projectIcon, GettextCatalog.GetString ("Project"), rootNamespace);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
index a87031db129..2dd8540e41c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
@@ -278,7 +278,7 @@ public void Reset ()
asm,
asm.Selected,
asm.File.ToString (),
- MonoDevelop.Ide.Gui.Stock.OpenFolder,
+ MonoDevelop.Ide.Gui.Stock.Folder,
matchRank);
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs
index a3df74f7789..d13dd719355 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs
@@ -33,15 +33,13 @@
using MonoDevelop.Components.AutoTest;
using MonoDevelop.Ide.Gui;
using System.ComponentModel;
+using MDStock = MonoDevelop.Ide.Gui.Stock;
namespace MonoDevelop.Ide.Projects
{
[System.ComponentModel.ToolboxItem (true)]
partial class GtkProjectFolderPreviewWidget : Gtk.Bin
{
- const string FolderIconId = "md-open-folder";
- const string FileIconId = "md-empty-file-icon";
-
const int TextColumn = 1;
const int ImageColumn = 2;
TreeStore folderTreeStore;
@@ -85,8 +83,8 @@ public GtkProjectFolderPreviewWidget ()
Styles.ColorGetHex (Styles.NewProjectDialog.ProjectConfigurationPreviewLabelColor),
global::Mono.Unix.Catalog.GetString ("PREVIEW"));
- CreateFolderTreeViewColumns ();
-
+ CreateFolderTreeViewColumns ();
+
// Accessibility
previewLabel.Accessible.Name = "projectFolderPreviewLabel";
previewLabel.Accessible.SetTitleFor (folderTreeView.Accessible);
@@ -159,15 +157,15 @@ public void Refresh ()
void AddProjectWithSolutionDirectoryToTree ()
{
- locationNode = folderTreeStore.AppendValues (FolderIconId, string.Empty);
+ locationNode = folderTreeStore.AppendValues (MDStock.Folder, string.Empty);
- solutionFolderNode = folderTreeStore.AppendValues (locationNode, FolderIconId, projectConfiguration.DefaultPreviewSolutionName);
- solutionNode = folderTreeStore.AppendValues (solutionFolderNode, FileIconId, projectConfiguration.DefaultPreviewSolutionFileName);
+ solutionFolderNode = folderTreeStore.AppendValues (locationNode, MDStock.Folder, projectConfiguration.DefaultPreviewSolutionName);
+ solutionNode = folderTreeStore.AppendValues (solutionFolderNode, MDStock.EmptyFile, projectConfiguration.DefaultPreviewSolutionFileName);
- projectFolderNode = folderTreeStore.AppendValues (solutionFolderNode, FolderIconId, projectConfiguration.DefaultPreviewProjectName);
+ projectFolderNode = folderTreeStore.AppendValues (solutionFolderNode, MDStock.Folder, projectConfiguration.DefaultPreviewProjectName);
gitFolderNode = AddGitFolderToTree ();
gitIgnoreNode = AddGitIgnoreToTree ();
- projectNode = folderTreeStore.AppendValues (projectFolderNode, FileIconId, projectConfiguration.DefaultPreviewProjectFileName);
+ projectNode = folderTreeStore.AppendValues (projectFolderNode, MDStock.EmptyFile, projectConfiguration.DefaultPreviewProjectFileName);
}
void UpdateTreeValues ()
@@ -181,15 +179,15 @@ void UpdateTreeValues ()
void AddProjectWithNoSolutionDirectoryToTree ()
{
- locationNode = folderTreeStore.AppendValues (FolderIconId, string.Empty);
+ locationNode = folderTreeStore.AppendValues (MDStock.Folder, string.Empty);
- projectFolderNode = folderTreeStore.AppendValues (locationNode, FolderIconId, projectConfiguration.DefaultPreviewProjectName);
- projectNode = folderTreeStore.AppendValues (projectFolderNode, FileIconId, projectConfiguration.DefaultPreviewProjectFileName);
+ projectFolderNode = folderTreeStore.AppendValues (locationNode, MDStock.Folder, projectConfiguration.DefaultPreviewProjectName);
+ projectNode = folderTreeStore.AppendValues (projectFolderNode, MDStock.EmptyFile, projectConfiguration.DefaultPreviewProjectFileName);
solutionFolderNode = TreeIter.Zero;
solutionNode = TreeIter.Zero;
if (projectConfiguration.IsNewSolution) {
- solutionNode = folderTreeStore.AppendValues (projectFolderNode, FileIconId, projectConfiguration.DefaultPreviewSolutionFileName);
+ solutionNode = folderTreeStore.AppendValues (projectFolderNode, MDStock.EmptyFile, projectConfiguration.DefaultPreviewSolutionFileName);
}
gitFolderNode = AddGitFolderToTree ();
@@ -198,10 +196,10 @@ void AddProjectWithNoSolutionDirectoryToTree ()
void AddProjectWithNoProjectDirectoryToTree ()
{
- locationNode = folderTreeStore.AppendValues (FolderIconId, string.Empty);
+ locationNode = folderTreeStore.AppendValues (MDStock.Folder, string.Empty);
projectFolderNode = TreeIter.Zero;
- projectNode = folderTreeStore.AppendValues (locationNode, FileIconId, projectConfiguration.DefaultPreviewProjectFileName);
+ projectNode = folderTreeStore.AppendValues (locationNode, MDStock.EmptyFile, projectConfiguration.DefaultPreviewProjectFileName);
solutionFolderNode = TreeIter.Zero;
solutionNode = TreeIter.Zero;
@@ -209,10 +207,10 @@ void AddProjectWithNoProjectDirectoryToTree ()
void AddSolutionToTree ()
{
- locationNode = folderTreeStore.AppendValues (FolderIconId, string.Empty);
+ locationNode = folderTreeStore.AppendValues (MDStock.Folder, string.Empty);
- solutionFolderNode = folderTreeStore.AppendValues (locationNode, FolderIconId, projectConfiguration.DefaultPreviewSolutionName);
- solutionNode = folderTreeStore.AppendValues (solutionFolderNode, FileIconId, projectConfiguration.DefaultPreviewSolutionFileName);
+ solutionFolderNode = folderTreeStore.AppendValues (locationNode, MDStock.Folder, projectConfiguration.DefaultPreviewSolutionName);
+ solutionNode = folderTreeStore.AppendValues (solutionFolderNode, MDStock.EmptyFile, projectConfiguration.DefaultPreviewSolutionFileName);
projectFolderNode = TreeIter.Zero;
gitFolderNode = TreeIter.Zero;
@@ -226,7 +224,7 @@ TreeIter AddGitFolderToTree ()
if (parent.Equals (TreeIter.Zero)) {
parent = projectFolderNode;
}
- return folderTreeStore.InsertWithValues (parent, 0, null, GetLightTextMarkup (".git"), GetTransparentIcon (FolderIconId));
+ return folderTreeStore.InsertWithValues (parent, 0, null, GetLightTextMarkup (".git"), GetTransparentIcon (MDStock.Folder));
}
static Xwt.Drawing.Image GetTransparentIcon (IconId iconId)
@@ -240,7 +238,7 @@ TreeIter AddGitIgnoreToTree ()
if (parent.Equals (TreeIter.Zero)) {
parent = projectFolderNode;
}
- return folderTreeStore.InsertWithValues (parent, 1, null, GetLightTextMarkup (".gitignore"), GetTransparentIcon (FileIconId));
+ return folderTreeStore.InsertWithValues (parent, 1, null, GetLightTextMarkup (".gitignore"), GetTransparentIcon (MDStock.EmptyFile));
}
static string GetLightTextMarkup (string text)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs
index 09c4833ab9e..322d8db74dd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs
@@ -186,8 +186,8 @@ bool SearchSibling (ref TreeIter iter, string name)
object[] GetFolderValues (string name)
{
- return new object[] { ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.OpenFolder, IconSize.Menu),
- ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.ClosedFolder, IconSize.Menu), name, null, false };
+ return new object[] { ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, IconSize.Menu),
+ ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, IconSize.Menu), name, null, false };
}
TreeIter GetPath (string fullPath)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
index 4165abbf212..ec908b4af24 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
@@ -854,7 +854,7 @@ public void Add (TemplateItem templateItem)
if (!string.IsNullOrEmpty (templateItem.Language))
name += "\n" + templateItem.Language + "";
string icon = templateItem.Template.Icon;
- templateStore.AppendValues (string.IsNullOrEmpty (icon) ? "md-file-source" : icon, name, templateItem);
+ templateStore.AppendValues (string.IsNullOrEmpty (icon) ? "md-source-file" : icon, name, templateItem);
}
public void Clear ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs
index c172f9320b5..b2c55042441 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs
@@ -242,7 +242,7 @@ public void Reset ()
} else {
name = GLib.Markup.EscapeText (fname);
}
- store.InsertWithValues (-1, name, version, null, selected, (string)file, GLib.Markup.EscapeText (file), MonoDevelop.Ide.Gui.Stock.OpenFolder, matchRank, null, ReferenceType.Assembly);
+ store.InsertWithValues (-1, name, version, null, selected, (string)file, GLib.Markup.EscapeText (file), MonoDevelop.Ide.Gui.Stock.Folder, matchRank, null, ReferenceType.Assembly);
}
}
} finally {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs
index 90cb6deab43..34c2fa9f78a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs
@@ -47,7 +47,7 @@ public partial class ProjectFileSelectorDialog : Gtk.Dialog
// NOTE: these should not be disposed, since they come from the icon scheme, and must instead be unref'd
// and the only way to unref is to let the finalizer handle it.
- Xwt.Drawing.Image projBuf, dirOpenBuf, dirClosedBuf;
+ Xwt.Drawing.Image projBuf, dirBuf;
public ProjectFileSelectorDialog (Project project)
: this (project, GettextCatalog.GetString ("All files"), "*")
@@ -68,9 +68,8 @@ public ProjectFileSelectorDialog (Project project, string defaultFilterName, str
this.Build();
projBuf = ImageService.GetIcon (project.StockIcon, IconSize.Menu);
- dirClosedBuf = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.ClosedFolder, IconSize.Menu);
- dirOpenBuf = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.OpenFolder, IconSize.Menu);
-
+ dirBuf = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Folder, IconSize.Menu);
+
TreeViewColumn projectCol = new TreeViewColumn ();
projectCol.Title = GettextCatalog.GetString ("Project Folders");
var pixRenderer = new CellRendererImage ();
@@ -196,9 +195,9 @@ void PixDataFunc (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_
pixRenderer.Image = projBuf;
return;
}
- pixRenderer.ImageExpanderOpen = dirOpenBuf;
- pixRenderer.ImageExpanderClosed = dirClosedBuf;
- pixRenderer.Image = dirClosedBuf;
+ pixRenderer.ImageExpanderOpen = dirBuf;
+ pixRenderer.ImageExpanderClosed = dirBuf;
+ pixRenderer.Image = dirBuf;
}
void TxtDataFunc (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
index f297eeec48a..5483843debf 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
@@ -129,7 +129,7 @@ TreeIter AddAssemplyReference (ProjectReference refInfo)
{
string txt = GLib.Markup.EscapeText (System.IO.Path.GetFileName (refInfo.Reference)) + "\n";
txt += "" + GLib.Markup.EscapeText (System.IO.Path.GetFullPath (refInfo.HintPath)) + "";
- return refTreeStore.AppendValues (txt, GetTypeText (refInfo), System.IO.Path.GetFullPath (refInfo.Reference), refInfo, ImageService.GetIcon ("md-empty-file-icon", IconSize.Dnd));
+ return refTreeStore.AppendValues (txt, GetTypeText (refInfo), System.IO.Path.GetFullPath (refInfo.Reference), refInfo, ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.EmptyFile, IconSize.Dnd));
}
TreeIter AddProjectReference (ProjectReference refInfo)
diff --git a/main/src/core/MonoDevelop.Ide/templates/AppConfigFile.xft.xml b/main/src/core/MonoDevelop.Ide/templates/AppConfigFile.xft.xml
index 6c95169ccab..28c5dcd512f 100644
--- a/main/src/core/MonoDevelop.Ide/templates/AppConfigFile.xft.xml
+++ b/main/src/core/MonoDevelop.Ide/templates/AppConfigFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Application Configuration File
- md-xml-file-icon
+ md-xml-file
<_Category>Misc
DotNet
<_Description>Creates a .NET application configuration file.
diff --git a/main/src/core/MonoDevelop.Ide/templates/AppManifest.xft.xml b/main/src/core/MonoDevelop.Ide/templates/AppManifest.xft.xml
index c0b41e995c3..cf21bfc6081 100644
--- a/main/src/core/MonoDevelop.Ide/templates/AppManifest.xft.xml
+++ b/main/src/core/MonoDevelop.Ide/templates/AppManifest.xft.xml
@@ -2,7 +2,7 @@
<_Name>App Manifest
- md-xml-file-icon
+ md-xml-file
<_Category>General
*
<_Description>Creates a Windows app manifest.
diff --git a/main/src/core/MonoDevelop.Ide/templates/EmptyHTMLFile.xft.xml b/main/src/core/MonoDevelop.Ide/templates/EmptyHTMLFile.xft.xml
index 32597e3f56f..ef427d9b473 100644
--- a/main/src/core/MonoDevelop.Ide/templates/EmptyHTMLFile.xft.xml
+++ b/main/src/core/MonoDevelop.Ide/templates/EmptyHTMLFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Empty HTML File
- md-html-file-icon
+ md-html-file
<_Category>Web
<_Description>Creates an empty HTML file.
EmptyHtmlFile
diff --git a/main/src/core/MonoDevelop.Ide/templates/EmptyResourceFile.xft.xml b/main/src/core/MonoDevelop.Ide/templates/EmptyResourceFile.xft.xml
index bfe1d9d579b..d55ad90b93b 100644
--- a/main/src/core/MonoDevelop.Ide/templates/EmptyResourceFile.xft.xml
+++ b/main/src/core/MonoDevelop.Ide/templates/EmptyResourceFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Resource File
- md-resource-file-icon
+ md-resource-file
<_Category>Misc
DotNet
<_Description>Creates a resx resource file.
diff --git a/main/src/core/MonoDevelop.Ide/templates/EmptyTextFile.xft.xml b/main/src/core/MonoDevelop.Ide/templates/EmptyTextFile.xft.xml
index 48f5d0f8fb3..10fbdf56b3a 100644
--- a/main/src/core/MonoDevelop.Ide/templates/EmptyTextFile.xft.xml
+++ b/main/src/core/MonoDevelop.Ide/templates/EmptyTextFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Empty Text File
- md-text-file-icon
+ md-text-file
<_Category>Misc
<_Description>Creates an empty text file.
EmptyTextFile
diff --git a/main/src/core/MonoDevelop.Ide/templates/EmptyXMLFile.xft.xml b/main/src/core/MonoDevelop.Ide/templates/EmptyXMLFile.xft.xml
index 25f4d2f2568..faf7716de74 100644
--- a/main/src/core/MonoDevelop.Ide/templates/EmptyXMLFile.xft.xml
+++ b/main/src/core/MonoDevelop.Ide/templates/EmptyXMLFile.xft.xml
@@ -3,7 +3,7 @@
<_Name>Empty XML File
- md-xml-file-icon
+ md-xml-file
<_Category>XML
<_Description>Creates an empty XML file.
EmptyXmlFile