diff --git a/src/Umbraco.Core/Macros/MacroTagParser.cs b/src/Umbraco.Core/Macros/MacroTagParser.cs
index ad4b180528..0b0949c978 100644
--- a/src/Umbraco.Core/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Core/Macros/MacroTagParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Umbraco.Core.Macros
 {
@@ -9,6 +10,91 @@ namespace Umbraco.Core.Macros
 	/// </summary>
 	internal class MacroTagParser
 	{
+        private static readonly Regex MacroRteContent = new Regex(@"(<div class=[""']umb-macro-holder[""'].*?>.*?<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(.*?</div>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+        private static readonly Regex MacroPersistedFormat = new Regex(@"<\?UMBRACO_MACRO macroAlias=[""'](\w+?)[""'].+?/>", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+
+	    /// <summary>
+	    /// This formats the persisted string to something useful for the rte so that the macro renders properly since we 
+	    /// persist all macro formats like {?UMBRACO_MACRO macroAlias=\"myMacro\" /}
+	    /// </summary>
+	    /// <param name="persistedContent"></param>
+	    /// <param name="htmlAttributes">The html attributes to be added to the div</param>
+	    /// <returns></returns>
+	    /// <remarks>
+	    /// This converts the persisted macro format to this:
+	    /// 
+	    ///     {div class='umb-macro-holder'}
+	    ///         <!-- <?UMBRACO_MACRO macroAlias=\"myMacro\" /> -->
+	    ///         This could be some macro content
+	    ///     {/div}
+	    /// 
+	    /// </remarks>
+	    internal static string FormatRichTextPersistedDataForEditor(string persistedContent, IDictionary<string ,string> htmlAttributes)
+        {
+            return MacroPersistedFormat.Replace(persistedContent, match =>
+            {
+                if (match.Groups.Count >= 2)
+                {
+                    //<div class="umb-macro-holder" data-load-content="false">
+                    var sb = new StringBuilder("<div class=\"umb-macro-holder\"");
+                    foreach (var htmlAttribute in htmlAttributes)
+                    {
+                        sb.Append(" ");
+                        sb.Append(htmlAttribute.Key);
+                        sb.Append("=\"");
+                        sb.Append(htmlAttribute.Value);
+                        sb.Append("\"");
+                    }
+                    sb.AppendLine(">");
+                    sb.Append("<!-- ");
+                    sb.Append(match.Groups[0].Value);
+                    sb.AppendLine(" -->");
+                    sb.Append("Macro alias: ");
+                    sb.Append("<strong>");
+                    sb.Append(match.Groups[1].Value);
+                    sb.Append("</strong></div>");
+                    return sb.ToString();
+                }
+                //replace with nothing if we couldn't find the syntax for whatever reason
+                return "";
+            });
+        }
+
+        /// <summary>
+        /// This formats the string content posted from a rich text editor that contains macro contents to be persisted.
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// 
+        /// This is required because when editors are using the rte, the html that is contained in the editor might actually be displaying 
+        /// the entire macro content, when the data is submitted the editor will clear most of this data out but we'll still need to parse it properly
+        /// and ensure the correct sytnax is persisted to the db.
+        /// 
+        /// When a macro is inserted into the rte editor, the html will be:
+        /// 
+        ///     {div class='umb-macro-holder'}
+        ///         <!-- <?UMBRACO_MACRO macroAlias=\"myMacro\" /> -->
+        ///         This could be some macro content
+        ///     {/div}
+        /// 
+        /// What this method will do is remove the {div} and parse out the commented special macro syntax: {?UMBRACO_MACRO macroAlias=\"myMacro\" /}
+        /// since this is exactly how we need to persist it to the db.
+        /// 
+        /// </remarks>
+        internal static string FormatRichTextContentForPersistence(string rteContent)
+        {
+            return MacroRteContent.Replace(rteContent, match =>
+                {
+                    if (match.Groups.Count >= 3)
+                    {
+                        //get the 3rd group which is the macro syntax
+                        return match.Groups[2].Value;
+                    }
+                    //replace with nothing if we couldn't find the syntax for whatever reason
+                    return "";
+                });
+        }
+
 		/// <summary>
 		/// This will accept a text block and seach/parse it for macro markup.
 		/// When either a text block or a a macro is found, it will call the callback method.
diff --git a/src/Umbraco.Tests/Macros/MacroParserTests.cs b/src/Umbraco.Tests/Macros/MacroParserTests.cs
new file mode 100644
index 0000000000..5204729626
--- /dev/null
+++ b/src/Umbraco.Tests/Macros/MacroParserTests.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+using Umbraco.Core.Macros;
+
+namespace Umbraco.Tests.Macros
+{
+    [TestFixture]
+    public class MacroParserTests
+    {
+        [Test]
+        public void Format_RTE_Data_For_Editor()
+        {
+            var content = @"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<?UMBRACO_MACRO macroAlias=""Map"" />
+<p>asdfasdf</p>";
+            var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>(){{"test1", "value1"},{"test2", "value2"}});
+
+            Assert.AreEqual(@"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
+Macro alias: <strong>Map</strong></div>
+<p>asdfasdf</p>", result);
+        }
+
+        [Test]
+        public void Format_RTE_Data_For_Persistence()
+        {
+            var content = @"<html>
+<body>
+<h1>asdfasdf</h1>
+<div class='umb-macro-holder' att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
+<!-- <?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2"" /> -->
+asdfasdf 
+asdfas
+<span>asdfasdfasdf</span>
+<p>asdfasdf</p>
+</div>
+<span>asdfdasf</span>
+<div>
+asdfsdf
+</div>
+</body>
+</html>";
+            var result = MacroTagParser.FormatRichTextContentForPersistence(content);
+
+            Assert.AreEqual(@"<html>
+<body>
+<h1>asdfasdf</h1>
+<?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2"" />
+<span>asdfdasf</span>
+<div>
+asdfsdf
+</div>
+</body>
+</html>", result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f302a431fd..38f3f87c8c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -238,6 +238,7 @@
     <Compile Include="Controllers\WebApiEditors\MediaControllerUnitTests.cs" />
     <Compile Include="CoreXml\FrameworkXmlTests.cs" />
     <Compile Include="Integration\CreateContent.cs" />
+    <Compile Include="Macros\MacroParserTests.cs" />
     <Compile Include="Migrations\Upgrades\ValidateV7UpgradeTest.cs" />
     <Compile Include="Models\ContentExtensionsTests.cs" />
     <Compile Include="Models\UserExtensionsTests.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 6c27e5c5ca..580fa89a7b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -294,9 +294,19 @@ function tinyMceService(dialogService, $log, imageHelper, assetsService, $timeou
                         template: "views/common/dialogs/insertmacro.html",
                         scope: $scope,
                         callback: function(data) {
-                            
+
+                            //put the macro syntax in comments, we will parse this out on the server side to be used
+                            //for persisting.
+                            var macroSyntaxComment = "<!-- " + data.syntax + " -->";
+
                             editor.insertContent(
-                                editor.dom.createHTML('div', { 'class': 'umb-macro-holder' }, 'Macro alias: <strong>' + data.macroAlias + '</strong>'));
+                                editor.dom.createHTML('div',
+                                    {
+                                        'class': 'umb-macro-holder',
+                                        // indicates whether or not this should kick off the ajax request to load in the macro contents.
+                                        'data-load-content': false
+                                    },
+                                    macroSyntaxComment + 'Macro alias: <strong>' + data.macroAlias + '</strong>'));
 
                         }
                     });
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 551f08f972..736d7444d4 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -1,4 +1,6 @@
-using Umbraco.Core;
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.Macros;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
@@ -6,5 +8,51 @@ namespace Umbraco.Web.PropertyEditors
     [PropertyEditor(Constants.PropertyEditors.TinyMCEv3Alias, "Rich Text Editor", "rte")]
     public class RichTextPropertyEditor : PropertyEditor
     {
+        /// <summary>
+        /// Create a custom value editor
+        /// </summary>
+        /// <returns></returns>
+        protected override PropertyValueEditor CreateValueEditor()
+        {
+            return new RichTextPropertyValueEditor(base.CreateValueEditor());
+        }
+
+        /// <summary>
+        /// A custom value editor to ensure that macro syntax is parsed when being persisted and formatted correctly for display in the editor
+        /// </summary>
+        internal class RichTextPropertyValueEditor : PropertyValueEditorWrapper
+        {
+            public RichTextPropertyValueEditor(PropertyValueEditor wrapped)
+                : base(wrapped)
+            {
+            }
+
+            /// <summary>
+            /// Format the data for the editor
+            /// </summary>
+            /// <param name="dbValue"></param>
+            /// <returns></returns>
+            public override object FormatDataForEditor(object dbValue)
+            {
+                var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(dbValue.ToString(), new Dictionary<string, string>());
+
+                return parsed;
+            }
+
+            /// <summary>
+            /// Format the data for persistence
+            /// </summary>
+            /// <param name="editorValue"></param>
+            /// <param name="currentValue"></param>
+            /// <returns></returns>
+            public override object FormatDataForPersistence(Core.Models.Editors.ContentPropertyData editorValue, object currentValue)
+            {
+                var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValue.Value.ToString());
+
+                return parsed;
+            }
+        }
     }
+
+    
 }
\ No newline at end of file
diff --git a/src/umbraco.cms/ClassDiagram1.cd b/src/umbraco.cms/ClassDiagram1.cd
deleted file mode 100644
index 60abc85680..0000000000
--- a/src/umbraco.cms/ClassDiagram1.cd
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1" MembersFormat="NameAndType">
-  <Font Name="Tahoma" Size="8.25" />
-  <Class Name="umbraco.cms.businesslogic.CMSNode">
-    <Position X="12" Y="0.5" Width="3.25" />
-    <TypeIdentifier>
-      <FileName>businesslogic\CMSNode.cs</FileName>
-      <HashCode>iAIDQAAAEIwCEBIFAABEYQAARAwAKBgNAAgBGAAAUAI=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_ConnString" Hidden="true" />
-      <Field Name="_createDate" Hidden="true" />
-      <Field Name="_hasChildren" Hidden="true" />
-      <Field Name="_id" Hidden="true" />
-      <Field Name="_level" Hidden="true" />
-      <Field Name="_nodeobjecttype" Hidden="true" />
-      <Field Name="_parentid" Hidden="true" />
-      <Field Name="_path" Hidden="true" />
-      <Field Name="_sortOrder" Hidden="true" />
-      <Field Name="_text" Hidden="true" />
-      <Field Name="_uniqueid" Hidden="true" />
-      <Field Name="_userId" Hidden="true" />
-      <Method Name="getUniquesFromObjectTypeAndFirstLetter" Hidden="true" />
-      <Method Name="MakeNew" Hidden="true" />
-      <Method Name="setupNode" Hidden="true" />
-      <Method Name="TopMostNodeIds" Hidden="true" />
-      <Method Name="UpdateTempPathForTree" Hidden="true" />
-      <Method Name="XmlPopulate" Hidden="true" />
-    </Members>
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.Content">
-    <Position X="4.75" Y="7.5" Width="2.75" />
-    <TypeIdentifier>
-      <FileName>businesslogic\Content.cs</FileName>
-      <HashCode>IAAAABABAAgAZAAAAAAQAYEBBAgAEAgEAAAQAASADAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_contentTypeIcon" Hidden="true" />
-      <Field Name="_version" Hidden="true" />
-      <Field Name="_versionDate" Hidden="true" />
-      <Field Name="_versionDateInitialized" Hidden="true" />
-      <Field Name="_xml" Hidden="true" />
-      <Method Name="CreateContent" Hidden="true" />
-      <Method Name="createNewVersion" Hidden="true" />
-      <Method Name="delete" Hidden="true" />
-      <Method Name="deleteAllProperties" Hidden="true" />
-      <Method Name="hasVersion" Hidden="true" />
-      <Method Name="importXml" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.ContentType">
-    <Position X="15.25" Y="7.5" Width="2.5" />
-    <TypeIdentifier>
-      <FileName>businesslogic\ContentType.cs</FileName>
-      <HashCode>AAAAAAAIAAIAAAAAACAAAQAABhgAAkAIAgAQAAQQCBA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_alias" Hidden="true" />
-      <Field Name="_iconurl" Hidden="true" />
-      <Method Name="Create" Hidden="true" />
-      <Method Name="delete" Hidden="true" />
-      <Method Name="setupContentType" Hidden="true" />
-    </Members>
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <NestedTypes>
-      <Interface Name="umbraco.cms.businesslogic.ContentType.TabI" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>businesslogic\ContentType.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Interface>
-      <Class Name="umbraco.cms.businesslogic.ContentType.Tab" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>businesslogic\ContentType.cs</NewMemberFileName>
-        </TypeIdentifier>
-        <Lollipop Position="0.2" />
-      </Class>
-    </NestedTypes>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.datatype.DataTypeDefinition">
-    <Position X="22.5" Y="7.5" Width="2.75" />
-    <TypeIdentifier>
-      <FileName>businesslogic\datatype\DataType.cs</FileName>
-      <HashCode>AAAAAAAAAAICEEAAAAAAAAAAIAAAAAAAAgAAACAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_controlId" Hidden="true" />
-      <Field Name="_objectType" Hidden="true" />
-      <Method Name="setupDataTypeDefinition" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.media.Media">
-    <Position X="1" Y="12.5" Width="2" />
-    <TypeIdentifier>
-      <FileName>businesslogic\media\Media.cs</FileName>
-      <HashCode>AAAAAAAAAAAAEEAAAAAEAQAABAAAAAAAAAQAAAAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_objectType" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.media.MediaType">
-    <Position X="12.5" Y="12.75" Width="2" />
-    <TypeIdentifier>
-      <FileName>businesslogic\media\MediaType.cs</FileName>
-      <HashCode>AAAAAAAAAAAAEEAAAAAAAQAAAgAAAAAAAgAAAAAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_objectType" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.member.Member">
-    <Position X="3.75" Y="12.5" Width="3.5" />
-    <TypeIdentifier>
-      <FileName>businesslogic\member\Member.cs</FileName>
-      <HashCode>AWgCAFAAQCAAEEEAAIAAQYQgBAAgAQguAgICCAFAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_groups" Hidden="true" />
-      <Field Name="_memberCache" Hidden="true" />
-      <Field Name="_objectType" Hidden="true" />
-      <Field Name="_text" Hidden="true" />
-      <Method Name="addCookie" Hidden="true" />
-      <Method Name="getCookieValue" Hidden="true" />
-      <Method Name="populateGroups" Hidden="true" />
-      <Method Name="removeCookie" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.member.MemberGroup">
-    <Position X="19.5" Y="7.5" Width="2.25" />
-    <TypeIdentifier>
-      <FileName>businesslogic\member\MemberGroup.cs</FileName>
-      <HashCode>AAAAAAAAAAAAEEAAAAAAAAAAAAAAAAAAAgAAAAAAAAg=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_objectType" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.member.MemberType">
-    <Position X="15.25" Y="12.75" Width="2.25" />
-    <TypeIdentifier>
-      <FileName>businesslogic\member\MemberType.cs</FileName>
-      <HashCode>AAACAAABAAAAEEAAEAAAAQAAAgAAAAAQAiAAAAAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_objectType" Hidden="true" />
-      <Method Name="propertyTypeRegistered" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.web.Document">
-    <Position X="8" Y="12.5" Width="3" />
-    <TypeIdentifier>
-      <FileName>businesslogic\web\Document.cs</FileName>
-      <HashCode>AAAEEOAAA8CIEECBOEAECYgABgAAAAgMAAEACiAAQJA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_creator" Hidden="true" />
-      <Field Name="_expire" Hidden="true" />
-      <Field Name="_httpContext" Hidden="true" />
-      <Field Name="_objectType" Hidden="true" />
-      <Field Name="_published" Hidden="true" />
-      <Field Name="_release" Hidden="true" />
-      <Field Name="_template" Hidden="true" />
-      <Field Name="_text" Hidden="true" />
-      <Field Name="_updated" Hidden="true" />
-      <Field Name="_userId" Hidden="true" />
-      <Field Name="_writer" Hidden="true" />
-      <Field Name="_xml" Hidden="true" />
-      <Method Name="addAttribute" Hidden="true" />
-      <Method Name="importXml" Hidden="true" />
-      <Method Name="setupDocument" Hidden="true" />
-      <Method Name="SetupDocumentForTree" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.web.DocumentType">
-    <Position X="18.25" Y="12.75" Width="2.25" />
-    <TypeIdentifier>
-      <FileName>businesslogic\web\DocumentType.cs</FileName>
-      <HashCode>AABQACAAAAAAEEAAAgECAQAACgAAAAAEAgAAAAAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_defaultTemplate" Hidden="true" />
-      <Field Name="_objectType" Hidden="true" />
-      <Field Name="_templateIds" Hidden="true" />
-      <Method Name="setupDocumentType" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.relation.Relation">
-    <Position X="9.25" Y="0.5" Width="2" />
-    <TypeIdentifier>
-      <FileName>businesslogic\relation\Relation.cs</FileName>
-      <HashCode>AAACAAAUEAAAEIAAAABAYAAAABECAAAAgIABAAAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_childNode" Hidden="true" />
-      <Field Name="_comment" Hidden="true" />
-      <Field Name="_datetime" Hidden="true" />
-      <Field Name="_id" Hidden="true" />
-      <Field Name="_parentNode" Hidden="true" />
-      <Field Name="_relType" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.relation.RelationType">
-    <Position X="9.25" Y="3.5" Width="2" />
-    <TypeIdentifier>
-      <FileName>businesslogic\relation\RelationType.cs</FileName>
-      <HashCode>EAICYAAAAAIAAAAAAABAAAwAAgAAAAAAAAAAAAAQAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_alias" Hidden="true" />
-      <Field Name="_childObjectType" Hidden="true" />
-      <Field Name="_dual" Hidden="true" />
-      <Field Name="_id" Hidden="true" />
-      <Field Name="_name" Hidden="true" />
-      <Field Name="_parentObjectType" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionNew" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="28.25" Y="2.25" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionSave" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="28.25" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionDelete" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="28.25" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionMove" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="26.5" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionCopy" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="26.5" Y="2.25" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionProtect" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="26.5" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionRollback" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="26.5" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionUpdate" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="28.25" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionPublish" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="30" Y="2.25" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionToPublish" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="30" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionRePublish" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="30" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.BusinessLogic.Actions.ActionUnPublish" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="30" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <FileName>Actions\defaultActions.cs</FileName>
-      <HashCode>AAAAAAAAAIIAAAIAAAAAAAQAQAAAAAAAgAAAAAEAAAA=</HashCode>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.property.Property">
-    <Position X="7.75" Y="7.5" Width="2" />
-    <TypeIdentifier>
-      <FileName>businesslogic\Property\Property.cs</FileName>
-      <HashCode>CAACAAAABAAAEACAAABAAQAAAAAAAAAEAEAiAAAAAAA=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_connstring" Hidden="true" />
-      <Field Name="_data" Hidden="true" />
-      <Field Name="_id" Hidden="true" />
-      <Field Name="_pt" Hidden="true" />
-    </Members>
-  </Class>
-  <Class Name="umbraco.cms.businesslogic.propertytype.PropertyType">
-    <Position X="12.25" Y="7.5" Width="2.75" />
-    <TypeIdentifier>
-      <FileName>businesslogic\propertytype\propertytype.cs</FileName>
-      <HashCode>AAEDNAAAAAIgEQCEACRACQQAAAAAAAAAAgAAAAQQAAE=</HashCode>
-    </TypeIdentifier>
-    <Members>
-      <Field Name="_alias" Hidden="true" />
-      <Field Name="_connstring" Hidden="true" />
-      <Field Name="_contenttypeid" Hidden="true" />
-      <Field Name="_DataTypeId" Hidden="true" />
-      <Field Name="_description" Hidden="true" />
-      <Field Name="_id" Hidden="true" />
-      <Field Name="_mandatory" Hidden="true" />
-      <Field Name="_name" Hidden="true" />
-      <Field Name="_sortOrder" Hidden="true" />
-      <Field Name="_tabId" Hidden="true" />
-      <Field Name="_validationRegExp" Hidden="true" />
-    </Members>
-  </Class>
-  <Interface Name="umbraco.interfaces.IData">
-    <Position X="26.5" Y="7" Width="2.25" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="umbraco.interfaces.IDataPrevalue">
-    <Position X="29" Y="9" Width="2.25" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="umbraco.interfaces.IDataType">
-    <Position X="29" Y="7" Width="2.25" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="umbraco.BusinessLogic.Actions.IActionHandler">
-    <Position X="27.75" Y="0.5" Width="2.25" />
-    <TypeIdentifier>
-      <FileName>Actions\Action.cs</FileName>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAgAAAAAAAAAACAAAAAA=</HashCode>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="umbraco.interfaces.IDataEditor">
-    <Position X="26.5" Y="9" Width="2.25" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="umbraco.interfaces.IDataFieldWithButtons">
-    <Position X="26.5" Y="11" Width="2.25" />
-    <TypeIdentifier />
-  </Interface>
-</ClassDiagram>
\ No newline at end of file
diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj
index 9c79259f1f..19fa159ac4 100644
--- a/src/umbraco.cms/umbraco.cms.csproj
+++ b/src/umbraco.cms/umbraco.cms.csproj
@@ -429,7 +429,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="businesslogic\Packager\FileResources\Packages.config" />
-    <None Include="ClassDiagram1.cd" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/umbraco.interfaces/IDataFieldWithButtons.cs b/src/umbraco.interfaces/IDataFieldWithButtons.cs
new file mode 100644
index 0000000000..eabb6ca4a4
--- /dev/null
+++ b/src/umbraco.interfaces/IDataFieldWithButtons.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace umbraco.interfaces
+{
+	/// <summary>
+	/// Summary description for IDataFieldWithButtons.
+	/// </summary>
+	public interface IDataFieldWithButtons : IDataEditor
+	{
+		object[] MenuIcons {get;}
+	}
+}
diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj
index 3f2e2f3b19..0f617173bd 100644
--- a/src/umbraco.interfaces/umbraco.interfaces.csproj
+++ b/src/umbraco.interfaces/umbraco.interfaces.csproj
@@ -124,6 +124,7 @@
     </Compile>
     <Compile Include="IApplication.cs" />
     <Compile Include="IApplicationStartupHandler.cs" />
+    <Compile Include="IDataFieldWithButtons.cs" />
     <Compile Include="IProperty.cs" />
     <Compile Include="ITag.cs" />
     <Compile Include="ITaskReturnUrl.cs" />