diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index f847e17a18..aa53d97638 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -15,7 +15,7 @@
   
   <cc2:Pane ID="Pane2" runat="server">
     <cc2:PropertyPanel runat="server" id="pp_newTab" Text="New tab">
-      <asp:TextBox ID="txtNewTab" runat="server"/> &nbsp; <asp:Button ID="btnNewTab" runat="server" Text="New tab" OnClick="btnNewTab_Click"/>
+      <asp:TextBox ID="txtNewTab" runat="server"/> &nbsp; <asp:Button ID="btnNewTab" CssClass="btn" runat="server" Text="New tab" OnClick="btnNewTab_Click"/>
     </cc2:PropertyPanel>
   </cc2:Pane>
     
@@ -25,8 +25,9 @@
       HeaderStyle-Font-Bold="True" AutoGenerateColumns="False" CssClass="tabs-table">
       <Columns>
         <asp:BoundColumn DataField="id" Visible="False"></asp:BoundColumn>
-        <asp:TemplateColumn HeaderText="Name (drag to re-order)">
+        <asp:TemplateColumn HeaderText="Name">
           <ItemTemplate>
+            <i class="icon-navigation handle"></i>
             <asp:TextBox ID="txtTab" runat="server" Value='<%#DataBinder.Eval(Container.DataItem,"name")%>'></asp:TextBox>
             <asp:TextBox ID="txtSortOrder" runat="server" CssClass="sort-order" Value='<%#DataBinder.Eval(Container.DataItem,"order") %>'></asp:TextBox>
           </ItemTemplate>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
index b99e16d8fc..039dc0d748 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -1,64 +1,69 @@
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="GenericProperty.ascx.cs" Inherits="umbraco.controls.GenericProperties.GenericProperty" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
+<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="GenericProperty.ascx.cs" Inherits="umbraco.controls.GenericProperties.GenericProperty" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
-<li id="<%=this.FullId%>" onMouseDown="activeDragId = this.id;">
-	<div class="propertyForm" id="<%=this.FullId%>_form">
+<li id="<%=this.FullId%>" onmousedown="activeDragId = this.id;">
+    <div class="propertyForm" id="<%=this.FullId%>_form">
+        <div id="desc<%=this.ClientID%>" ondblclick="expandCollapse('<%=this.ClientID%>'); document.getElementById('<%=this.ClientID%>_tbName').focus();">
+            <div class="header">
+                <i class="icon-navigation handle"></i>
 
-			<div id="desc<%=this.ClientID%>" ondblclick="expandCollapse('<%=this.ClientID%>'); document.getElementById('<%=this.ClientID%>_tbName').focus();" 
-			style="padding: 0px; display: block; margin: 0px;">
-	
-			<h3 style="padding: 0px; margin: 0px;">
-			<asp:ImageButton ID="DeleteButton2" Runat="server"></asp:ImageButton>
-			 
-			<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
-			  <asp:Literal ID="FullHeader" Runat="server"></asp:Literal>
-			</a>
-			
-			</h3>
-			</div>
-			
-			<div id="edit<%=this.ClientID%>"  style="DISPLAY: none;">
-			
-			<h3 style="padding: 0px; margin: 0px;">
-			  <asp:ImageButton ID="DeleteButton" Runat="server"></asp:ImageButton>
-			  <a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl(  umbraco.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right"  />
-			  Edit "<asp:Literal ID="Header" Runat="server"></asp:Literal>"</a>
-			</h3>
-			
-			<cc1:Pane runat="server">
-        <cc1:PropertyPanel runat="server" Text="Name">
-          <asp:TextBox id="tbName" runat="server" CssClass="propertyFormInput"></asp:TextBox>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Alias">
-         <asp:TextBox id="tbAlias" runat="server" CssClass="propertyFormInput"></asp:TextBox>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel ID="PropertyPanel2" runat="server" Text="Type">
-          <asp:DropDownList id="ddlTypes" runat="server" CssClass="propertyFormInput"></asp:DropDownList>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel ID="PropertyPanel3" runat="server" Text="Tab">
-          <asp:DropDownList id="ddlTab" runat="server" CssClass="propertyFormInput"></asp:DropDownList>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel ID="PropertyPanel4" runat="server" Text="Mandatory">
-          <asp:CheckBox id="checkMandatory" runat="server"></asp:CheckBox>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel ID="PropertyPanel5" runat="server" Text="Validation">
-          <asp:TextBox id="tbValidation" runat="server" TextMode="MultiLine" CssClass="propertyFormInput"></asp:TextBox><br />
-          <small><asp:HyperLink ID="validationLink" runat="server">Search for a regular expression</asp:HyperLink></small>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel ID="PropertyPanel6" runat="server" Text="Description">
-          <asp:TextBox id="tbDescription" runat="server" CssClass="propertyFormInput" TextMode="MultiLine"></asp:TextBox>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-		</div>
-		
-			
-		</div>
+                <asp:LinkButton ID="DeleteButton2" runat="server">
+                    <i class="btn btn-mini icon-delete"></i> 
+                </asp:LinkButton>
+
+                <a href="javascript:expandCollapse('<%=this.ClientID%>');">
+
+                    <i class="toggle-button btn btn-mini icon-navigation-down"></i>
+                    <asp:Literal ID="FullHeader" runat="server"></asp:Literal>
+                </a>
+            </div>
+        </div>
+
+        <div id="edit<%=this.ClientID%>" style="DISPLAY: none;">
+            <div class="header">
+                <i class="icon-navigation handle"></i>
+                <asp:LinkButton ID="DeleteButton" runat="server">
+                      <i class="btn btn-mini icon-delete"></i> 
+                </asp:LinkButton>
+                <a href="javascript:expandCollapse('<%=this.ClientID%>');">
+                    <i class="toggle-button btn btn-mini icon-navigation-up"></i>
+                    Edit "<asp:Literal ID="Header" runat="server"></asp:Literal>"
+                </a>
+            </div>
+
+            <cc1:Pane runat="server">
+                <cc1:PropertyPanel runat="server" Text="Name">
+                    <asp:TextBox ID="tbName" runat="server" CssClass="propertyFormInput"></asp:TextBox>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Alias">
+                    <asp:TextBox ID="tbAlias" runat="server" CssClass="propertyFormInput"></asp:TextBox>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel2" runat="server" Text="Type">
+                    <asp:DropDownList ID="ddlTypes" runat="server" CssClass="propertyFormInput"></asp:DropDownList>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel3" runat="server" Text="Tab">
+                    <asp:DropDownList ID="ddlTab" runat="server" CssClass="propertyFormInput"></asp:DropDownList>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel4" runat="server" Text="Mandatory">
+                    <asp:CheckBox ID="checkMandatory" runat="server"></asp:CheckBox>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel5" runat="server" Text="Validation">
+                    <asp:TextBox ID="tbValidation" runat="server" TextMode="MultiLine" CssClass="propertyFormInput"></asp:TextBox><br />
+                    <small>
+                        <asp:HyperLink ID="validationLink" runat="server">Search for a regular expression</asp:HyperLink></small>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel6" runat="server" Text="Description">
+                    <asp:TextBox ID="tbDescription" runat="server" CssClass="propertyFormInput" TextMode="MultiLine"></asp:TextBox>
+                </cc1:PropertyPanel>
+            </cc1:Pane>
+        </div>
+    </div>
 </li>
 <script type="text/javascript">
     $(function () {
@@ -69,4 +74,4 @@
             duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>');
         }
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericproperty.css b/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericproperty.css
index bbc19b690e..5183a9bccd 100644
--- a/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericproperty.css
+++ b/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericproperty.css
@@ -1,42 +1,64 @@
 
 .genericPropertyForm {
-  padding: 5px;
+ 
 }
 .genericPropertyForm h2 {
-  font-size: 15px;
-  margin-bottom: 0px;
-  padding-bottom: 2px;
+    font-size: 16px;
+    line-height: 20px;
+    margin-bottom: 2px;
+}
+
+.genericPropertyList .header{
+    padding: 4px;
+}
+.genericPropertyList .umb-pane{
+    margin: 10px;
 }
 
 .genericPropertyList {
-  padding: 10px;
-  margin: 0px;
+  margin: 0px 0px 30px 0px;
   list-style: none;
 }
 
+.genericPropertyList .delete-button, .genericPropertyList .toggle-button{
+  float: right;
+  margin-left: 3px;
+  border: none;
+  background: none;
+  text-decoration: none;
+}
+
+.genericPropertyList .delete-button i {
+    background: none;
+    border: none;
+}
+
+.handle{
+    color: #ccc;
+    font-size: 12px;
+}
+
+.addNewProperty .handle {
+    display: none;
+}
+
 .genericPropertyList li {
-  padding: 7px;
   display: block;
   position: relative;
-  background: url(../tabView/images/background.gif) #EEEEEE repeat-x bottom;
-  border: 1px solid #ccc;
+  border-bottom: 1px solid #eee;
   margin-bottom: 3px;
   cursor: move;
 }
+
+.genericPropertyList li .delete-button i {
+    color: #b94a48;
+}
+
 .addNewProperty li {
   cursor: default;
 }
 
-.genericPropertyList li div.propertypane{
-  background-image: none !Important;
-}
-.genericPropertyList li h3 {
-  font-size: 11px;
-  padding-left: 10px;
-}
-
 .genericPropertyList li table {
-  border-top: 1px solid #ccc;
   display: block;
   margin-top: 10px;
 }
@@ -50,14 +72,16 @@
   width: 300px;
   z-index: 9999;
 }
+
 .propertyForm SELECT {
   width: 300px;
 }
 
-
 .propertyForm h3 a {
   color: #000;
   text-decoration: none;
+  font-size: 14px;
+  font-weight: normal;
 }
 
 
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 7a38d151a0..fbd3291534 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -424,6 +424,7 @@ namespace umbraco.controls
             Save.Click += save_click;
             Save.Text = ui.Text("save", Security.CurrentUser);
             Save.ID = "save";
+            Save.ButtonType = uicontrols.MenuButtonType.Primary;
 
             txtName.Text = _contentType.GetRawText();
             txtAlias.Text = _contentType.Alias;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
index 82aee989aa..9040931eba 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
@@ -171,12 +171,10 @@ namespace umbraco.controls.GenericProperties
 				FullHeader.Text = _pt.GetRawName() + " (" + _pt.Alias + "), Type: " + _pt.DataTypeDefinition.Text;;
 				Header.Text = _pt.GetRawName();
 				DeleteButton.Visible = true;
-				DeleteButton.ImageUrl = SystemDirectories.Umbraco + "/images/delete_button.png";
-				DeleteButton.Attributes.Add("style", "float: right; cursor: hand;");
+                DeleteButton.CssClass = "delete-button";
                 DeleteButton.Attributes.Add("onclick", "return confirm('" + ui.Text("areyousure", CurrentUser) + "');");
 				DeleteButton2.Visible = true;
-                DeleteButton2.ImageUrl = SystemDirectories.Umbraco + "/images/delete_button.png";
-				DeleteButton2.Attributes.Add("style", "float: right; cursor: hand;");
+                DeleteButton2.CssClass = "delete-button";
                 DeleteButton2.Attributes.Add("onclick", "return confirm('" + ui.Text("areyousure", CurrentUser) + "');");
 			} 
 			else 
@@ -289,20 +287,21 @@ namespace umbraco.controls.GenericProperties
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.DeleteButton.Click += new System.Web.UI.ImageClickEventHandler(this.DeleteButton_Click);
-			this.DeleteButton2.Click += new System.Web.UI.ImageClickEventHandler(this.DeleteButton2_Click);
+			this.DeleteButton.Click +=DeleteButton_Click;
+            this.DeleteButton2.Click += DeleteButton2_Click;
 
 		}
+
+        void DeleteButton2_Click(object sender, EventArgs e)
+        {
+            Delete(this, new System.EventArgs());
+        }
+
+        void DeleteButton_Click(object sender, EventArgs e)
+        {
+            Delete(this, new System.EventArgs());
+        }
 		#endregion
 
-		private void DeleteButton_Click(object sender, System.Web.UI.ImageClickEventArgs e)
-		{
-			Delete(this,new System.EventArgs());
-		}
-
-		private void DeleteButton2_Click(object sender, System.Web.UI.ImageClickEventArgs e)
-		{
-			Delete(this,new System.EventArgs());
-		}
 	}
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs
index 6821d6c3a3..8c7a0b01b7 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs
@@ -19,7 +19,7 @@ namespace umbraco.controls.GenericProperties {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.ImageButton DeleteButton2;
+        protected global::System.Web.UI.WebControls.LinkButton DeleteButton2;
         
         /// <summary>
         /// FullHeader control.
@@ -37,7 +37,7 @@ namespace umbraco.controls.GenericProperties {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.ImageButton DeleteButton;
+        protected global::System.Web.UI.WebControls.LinkButton DeleteButton;
         
         /// <summary>
         /// Header control.