diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index 278009ba22..2bbdaeeee4 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -113,7 +113,7 @@
             UmbClientMgr.openAngularModalWindow({
                 template: 'views/common/dialogs/iconpicker.html', 
                 callback: function(data){
-                    jQuery(that).next().val("." + data);
+                    jQuery(that).next().val(data);
                     jQuery(that).find("i").attr("class", data);
                 }}); 
             
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 736d7444d4..e30d5f5dcf 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -34,8 +34,10 @@ namespace Umbraco.Web.PropertyEditors
             /// <returns></returns>
             public override object FormatDataForEditor(object dbValue)
             {
-                var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(dbValue.ToString(), new Dictionary<string, string>());
+                if (dbValue == null)
+                    return dbValue;
 
+                var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(dbValue.ToString(), new Dictionary<string, string>());
                 return parsed;
             }
 
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 603365956b..b747e0bee6 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -429,7 +429,6 @@ namespace umbraco.controls
             txtName.Text = _contentType.GetRawText();
             txtAlias.Text = _contentType.Alias;
             description.Text = _contentType.GetRawDescription();
-
             tb_icon.Value = _contentType.IconUrl;
             
             if(string.IsNullOrEmpty(_contentType.IconUrl))