diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index 6df7c7b3dc..1498183577 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -109,9 +109,12 @@
     });
 
 
-
     jQuery(document).ready(function () {
 
+        checkAlias('.prop-alias');
+   
+        duplicatePropertyNameAsSafeAlias('ul.addNewProperty .prop-name', 'ul.addNewProperty .prop-alias');
+   
         jQuery(".icon-picker").click(function(){
             var that = this;
             UmbClientMgr.openAngularModalWindow({
diff --git a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
index 039dc0d748..83a3aa1362 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -33,11 +33,11 @@
 
             <cc1:Pane runat="server">
                 <cc1:PropertyPanel runat="server" Text="Name">
-                    <asp:TextBox ID="tbName" runat="server" CssClass="propertyFormInput"></asp:TextBox>
+                    <asp:TextBox ID="tbName" runat="server" CssClass="propertyFormInput prop-name"></asp:TextBox>
                 </cc1:PropertyPanel>
 
                 <cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Alias">
-                    <asp:TextBox ID="tbAlias" runat="server" CssClass="propertyFormInput"></asp:TextBox>
+                    <asp:TextBox ID="tbAlias" runat="server" CssClass="propertyFormInput prop-alias"></asp:TextBox>
                 </cc1:PropertyPanel>
 
                 <cc1:PropertyPanel ID="PropertyPanel2" runat="server" Text="Type">
@@ -64,14 +64,4 @@
             </cc1:Pane>
         </div>
     </div>
-</li>
-<script type="text/javascript">
-    $(function () {
-        checkAlias('<%=tbAlias.ClientID%>');
-        var textbox = $('#<%=tbAlias.ClientID%>');
-        var ul = textbox.closest('ul');
-        if (ul.hasClass('addNewProperty')) {
-            duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>');
-        }
-    });
-</script>
+</li>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js b/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
index 780793f762..524947ae91 100644
--- a/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
+++ b/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
@@ -13,9 +13,9 @@ function expandCollapse(theId) {
     }
 }
 function duplicatePropertyNameAsSafeAlias(nameId, aliasId) {
-    var input = $('#' + aliasId);
+    var input = $(aliasId);
 
-    $('#' + nameId).keyup(function(event) {
+    $(nameId).keyup(function(event) {
         var value = $(this).val();
         getSafeAlias(aliasId, value, false, function (alias) {
             input.val(alias);
@@ -24,7 +24,7 @@ function duplicatePropertyNameAsSafeAlias(nameId, aliasId) {
 }
 
 function checkAlias(aliasId) {
-    var input = $('#' + aliasId);
+    var input = $(aliasId);
     
     input.keyup(function(event) {
         var value = $(this).val();
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
index 4cdad45578..aa7571db52 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -1,72 +1,67 @@
 <%@ 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.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.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.Core.IO.IOHelper.ResolveUrl(  Umbraco.Core.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>
-</li>
-<script type="text/javascript">
-    $(function () {
-        checkAlias('<%=tbAlias.ClientID%>');
-        var textbox = $('#<%=tbAlias.ClientID%>');
-        var ul = textbox.closest('ul');
-        if (ul.hasClass('addNewProperty')) {
-            duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>');
-        }
-    });
-</script>
\ No newline at end of file
+                <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 prop-name"></asp:TextBox>
+                </cc1:PropertyPanel>
+
+                <cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Alias">
+                    <asp:TextBox ID="tbAlias" runat="server" CssClass="propertyFormInput prop-alias"></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>
\ No newline at end of file