diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index 7fc9bbf44c..f847e17a18 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -56,12 +56,8 @@
   <cc2:Pane runat="server">  
     <cc2:PropertyPanel ID="pp_icon" runat="server" Text="Icon">
         <div class="umbIconDropdownList">
-          <asp:DropDownList ID="ddlIcons"  CssClass="guiInputText guiInputStandardSize" runat="server"/>
-        </div>
-    </cc2:PropertyPanel>
-    <cc2:PropertyPanel ID="pp_thumbnail" runat="server" Text="Thumbnail">
-        <div class="umbThumbnailDropdownList">
-          <asp:DropDownList ID="ddlThumbnails" CssClass="guiInputText guiInputStandardSize" runat="server"/>
+          <a href="#">Choose...</a>
+          <asp:TextBox ID="tb_icon" runat="server" />        
         </div>
     </cc2:PropertyPanel>
     <cc2:PropertyPanel ID="pp_description" runat="server" Text="Description">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
index 87c146c9c1..4ef0462d54 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoPage.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %>
+<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoDialog.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %>
 
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -24,17 +24,23 @@
 
 </asp:Content>
 <asp:Content ContentPlaceHolderID="body" runat="server">
+
+    
     <asp:Panel ID="pl_edit" runat="server" Visible="false">
+        
+            
         <cc2:Pane ID="pane_edit" runat="server">
             <div class="macro-properties">
                 <asp:PlaceHolder ID="macroProperties" runat="server" />
             </div>
         </cc2:Pane>
-        <p>
-            <input data-bind="click: updateMacro" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
-            <em>or </em>
-            <a data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-        </p>
+
+
+         <cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+             <a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+             <input data-bind="click: updateMacro" class="btn btn-primary" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
+        </cc2:Pane>
+
         
         <script type="text/javascript">
             (function($) {
@@ -49,18 +55,20 @@
         </script>
 
     </asp:Panel>
+
     <asp:Panel ID="pl_insert" runat="server">
         <cc2:Pane ID="pane_insert" runat="server">
             <cc2:PropertyPanel ID="pp_chooseMacro" runat="server" Text="Choose a macro">
                 <asp:ListBox Rows="1" ID="umb_macroAlias" runat="server"></asp:ListBox>
             </cc2:PropertyPanel>
         </cc2:Pane>
-        <p>
-            <asp:Button ID="bt_insert" runat="server" Text="ok" OnClick="renderProperties"></asp:Button>
-            <em>or </em>
-            <a data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-        </p>
+        
+        <cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+            <a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+             <asp:Button ID="bt_insert" runat="server" CssClass="btn btn-primary" Text="ok" OnClick="renderProperties"></asp:Button>
+        </cc2:Pane>
     </asp:Panel>
+    
     <div id="renderContent" style="display: none">
         <asp:PlaceHolder ID="renderHolder" runat="server"></asp:PlaceHolder>
     </div>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx b/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
index 4ae6523dc6..101b0ae3f5 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
@@ -39,6 +39,7 @@
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <uc1:ContentTypeControlNew ID="ContentTypeControlNew1" runat="server"></uc1:ContentTypeControlNew>
+
     <cc1:Pane ID="tmpPane" runat="server">
         <cc1:PropertyPanel Text="Allowed templates" runat="server">
             <div class="guiInputStandardSize" style="border: #ccc 1px solid; background: #fff;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index 9173f9f681..4cf32c41f5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -35,8 +35,6 @@ namespace umbraco.controls
     [ClientDependency(ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient")]
     [ClientDependency(ClientDependencyType.Javascript, "ui/jquery.dd.js", "UmbracoClient")]
     [ClientDependency(ClientDependencyType.Css, "ui/dd.css", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Css, "Tree/treeIcons.css", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Css, "Tree/Themes/umbraco/style.css", "UmbracoClient")]
     [ClientDependency(ClientDependencyType.Css, "GenericProperty/genericproperty.css", "UmbracoClient")]
     [ClientDependency(ClientDependencyType.Javascript, "GenericProperty/genericproperty.js", "UmbracoClient")]
     public partial class ContentTypeControlNew : UmbracoUserControl
@@ -103,7 +101,7 @@ namespace umbraco.controls
             pp_allowedChildren.Text = ui.Text("allowedchildnodetypes", Security.CurrentUser);
             pp_description.Text = ui.Text("editcontenttype", "description", Security.CurrentUser);
             pp_icon.Text = ui.Text("icon", Security.CurrentUser);
-            pp_thumbnail.Text = ui.Text("editcontenttype", "thumbnail", Security.CurrentUser);
+            //pp_thumbnail.Text = ui.Text("editcontenttype", "thumbnail", Security.CurrentUser);
 
 
             // we'll disable this...
@@ -267,7 +265,7 @@ namespace umbraco.controls
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void save_click(object sender, ImageClickEventArgs e)
+        protected void save_click(object sender, EventArgs e)
         {
 
             var state = new SaveAsyncState(
@@ -296,9 +294,9 @@ namespace umbraco.controls
                     {
                         _contentType.ContentTypeItem.Name = txtName.Text;
                         _contentType.ContentTypeItem.Alias = txtAlias.Text;
-                        _contentType.ContentTypeItem.Icon = ddlIcons.SelectedValue;
+                        _contentType.ContentTypeItem.Icon = tb_icon.Text;
                         _contentType.ContentTypeItem.Description = description.Text;
-                        _contentType.ContentTypeItem.Thumbnail = ddlThumbnails.SelectedValue;
+                        //_contentType.ContentTypeItem.Thumbnail = ddlThumbnails.SelectedValue;
                         _contentType.ContentTypeItem.AllowedAsRoot = allowAtRoot.Checked;
 
                         int i = 0;
@@ -340,9 +338,9 @@ namespace umbraco.controls
                         if (asyncState.HasAliasChanged())
                             _contentType.Alias = txtAlias.Text;
 
-                        _contentType.IconUrl = ddlIcons.SelectedValue;
+                        _contentType.IconUrl = tb_icon.Text;
                         _contentType.Description = description.Text;
-                        _contentType.Thumbnail = ddlThumbnails.SelectedValue;
+                        //_contentType.Thumbnail = ddlThumbnails.SelectedValue;
 
                         SavePropertyTypesLegacy(asyncState.SaveArgs);
 
@@ -421,24 +419,24 @@ namespace umbraco.controls
             InfoTabPage = TabView1.NewTabPage("Info");
             InfoTabPage.Controls.Add(pnlInfo);
 
-            InfoTabPage.Style.Add("text-align", "center");
-
-            ImageButton Save = InfoTabPage.Menu.NewImageButton();
+            var Save = TabView1.Menu.NewButton();
             Save.Click += save_click;
-
-            Save.ImageUrl = UmbracoPath + "/images/editor/save.gif";
-            Save.AlternateText = ui.Text("save", Security.CurrentUser);
+            Save.Text = ui.Text("save", Security.CurrentUser);
             Save.ID = "save";
-            
+
+            txtName.Text = _contentType.GetRawText();
+            txtAlias.Text = _contentType.Alias;
+            description.Text = _contentType.GetRawDescription();
+            tb_icon.Text = _contentType.IconUrl;
+
+
+            /*
             var dirInfo = new DirectoryInfo(Server.MapPath(SystemDirectories.Umbraco + "/images/umbraco"));
             var fileInfo = dirInfo.GetFiles();
 
             var spriteFileNames = CMSNode.DefaultIconClasses.Select(IconClassToIconFileName).ToList();
-
             var diskFileNames = fileInfo.Select(FileNameToIconFileName).ToList();
-            
             var listOfIcons = new List<ListItem>();
-
             // .sprNew was never intended to be in the document type editor
             foreach (var iconClass in CMSNode.DefaultIconClasses.Where(iconClass => iconClass.Equals(".sprNew", StringComparison.InvariantCultureIgnoreCase) == false))
             {
@@ -470,6 +468,7 @@ namespace umbraco.controls
 
             ddlIcons.Items.AddRange(listOfIcons.OrderBy(o => o.Text).ToArray());
 
+            
             // Get thumbnails
             dirInfo = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Umbraco + "/images/thumbnails"));
             fileInfo = dirInfo.GetFiles();
@@ -482,9 +481,10 @@ namespace umbraco.controls
                 if (this.Page.IsPostBack == false && li.Value == _contentType.Thumbnail) 
                     li.Selected = true;
 
-                ddlThumbnails.Items.Add(li);
+               // ddlThumbnails.Items.Add(li);
             }
 
+            
             Page.ClientScript.RegisterStartupScript(this.GetType(), "thumbnailsDropDown", string.Format(@"
 function refreshDropDowns() {{
     jQuery('#{1}').msDropDown({{ showIcon: true, style: 'width:250px;' }});
@@ -495,7 +495,7 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
             txtName.Text = _contentType.GetRawText();
             txtAlias.Text = _contentType.Alias;
             description.Text = _contentType.GetRawDescription();
-
+            */
         }
 
         private void AddSpriteListItem(string iconClass, ICollection<ListItem> listOfIcons)
@@ -549,11 +549,7 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
 
             uicontrols.TabPage tp = TabView1.NewTabPage("Structure");
             tp.Controls.Add(pnlStructure);
-            tp.Style.Add("text-align", "center");
-            ImageButton Save = tp.Menu.NewImageButton();
-            Save.Click += new System.Web.UI.ImageClickEventHandler(save_click);
-            Save.ImageUrl = UmbracoPath + "/images/editor/save.gif";
-
+            
             int[] allowedIds = _contentType.AllowedChildContentTypeIDs;
             if (!Page.IsPostBack)
             {
@@ -600,13 +596,7 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
         private void SetupGenericPropertiesPane()
         {
             GenericPropertiesTabPage = TabView1.NewTabPage("Generic properties");
-            GenericPropertiesTabPage.Style.Add("text-align", "center");
             GenericPropertiesTabPage.Controls.Add(pnlProperties);
-
-            ImageButton Save = GenericPropertiesTabPage.Menu.NewImageButton();
-            Save.Click += new System.Web.UI.ImageClickEventHandler(save_click);
-            Save.ImageUrl = UmbracoPath + "/images/editor/save.gif";
-
             BindDataGenericProperties(false);
         }
 
@@ -1157,15 +1147,7 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
         private void SetupTabPane()
         {
             uicontrols.TabPage tp = TabView1.NewTabPage("Tabs");
-
-            pnlTab.Style.Add("text-align", "center");
             tp.Controls.Add(pnlTab);
-
-            ImageButton Save = tp.Menu.NewImageButton();
-            Save.Click += new System.Web.UI.ImageClickEventHandler(save_click);
-            Save.ID = "SaveButton";
-            Save.ImageUrl = UmbracoPath + "/images/editor/save.gif";
-
             BindTabs();
         }
 
@@ -1543,26 +1525,9 @@ Umbraco.Controls.TabView.onActiveTabChange(function(tabviewid, tabid, tabs) {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlIcons;
-
-        /// <summary>
-        /// pp_thumbnail control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_thumbnail;
-
-        /// <summary>
-        /// ddlThumbnails control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlThumbnails;
+        protected global::System.Web.UI.WebControls.TextBox tb_icon;
 
+        
         /// <summary>
         /// pp_description control.
         /// </summary>